Merge pull request #1818 from jfrog/jp-10.15.0

[jfrog-platform] 10.15.0 release
jfrog · Sep 12, 2023 · 201bffc · 201bffc
2 parents 721428f + fb3c138
commit 201bffc
Show file tree

Hide file tree

Showing 44 changed files with 615 additions and 104 deletions.
diff --git a/stable/artifactory-cpp-ce/CHANGELOG.md b/stable/artifactory-cpp-ce/CHANGELOG.md
@@ -1,7 +1,10 @@
 # JFrog Artifactory CE for C++ Chart Changelog
 All changes to this chart will be documented in this file
 
-## [107.63.14] - Aug 25, 2022
+## [107.68.7] - Jul 20, 2023
+* Disabled federation services when splitServicesToContainers=true
+
+## [107.45.0] - Aug 25, 2022
 * Included event service as mandatory and remove the flag from values.yaml
 
 ## [107.41.0] - Jul 22, 2022

diff --git a/stable/artifactory-cpp-ce/Chart.yaml b/stable/artifactory-cpp-ce/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 7.63.14
+appVersion: 7.68.7
 dependencies:
 - name: artifactory
   repository: file://charts/artifactory
-  version: 107.63.14
+  version: 107.68.7
 description: JFrog Artifactory CE for C++
 home: https://www.jfrog.com/artifactory/
 icon: https://raw.githubusercontent.com/jfrog/charts/master/stable/artifactory-cpp-ce/logo/conan.png
@@ -21,4 +21,4 @@ name: artifactory-cpp-ce
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.63.14
+version: 107.68.7
diff --git a/stable/artifactory-cpp-ce/values.yaml b/stable/artifactory-cpp-ce/values.yaml
@@ -62,9 +62,11 @@ artifactory:
   # database:
   jfconnect:
     enabled: false
+  federation:
+    enabled: false
 ## Enable the PostgreSQL sub chart
 postgresql:
   enabled: true
 router:
   image:
-    tag: 7.71.0
+    tag: 7.77.0
diff --git a/stable/artifactory-ha/CHANGELOG.md b/stable/artifactory-ha/CHANGELOG.md
@@ -1,16 +1,32 @@
 # JFrog Artifactory-ha Chart Changelog
 All changes to this chart will be documented in this file
 
-## [107.63.14] - Aug 7, 2023
+## [107.68.7] - Aug 28, 2023
+* Enabled `unifiedSecretInstallation` as true by default
+* Removed unused `artifactory.javaOpts` from values.yaml
+
+## [107.67.0] - Aug 28, 2023
+* Add 'extraJavaOpts' and 'port' values to federation service
+
+## [107.66.0] - Aug 28, 2023
+* Added federation service container in artifactory
+* Add rtfs service to ingress in artifactory
+
+## [107.64.0] - Aug 28,2023
+* Added support to configure event.webhooks within generated system.yaml
+* Fixed an issue to generate ssl certificate should support artifactory-ha fullname
+* Added 'multiPartLimit' and 'multipartElementSize' parameters to awsS3V3 binary providers.
+* Increased default Artifactory Tomcat acceptCount config to 400
+* Fixed Illegal Strict-Transport-Security header in nginx config
+
+## [107.63.0] - Aug 28, 2023
 * Added support for Openshift by adding the securityContext in container level.
 * **IMPORTANT**
 * Disable securityContext in container and pod level to deploy postgres on openshift.
 * Fixed support for fsGroup in non openshift environment and runAsGroup in openshift environment.
 * Fixed - Helm Template Error when using artifactory.loggers [GH-1791](https://github.com/jfrog/charts/issues/1791)
 * Removed the nginx disable condition for openshift
-* Added support to configure event.webhooks within generated system.yaml
-* Fixed an issue to generate ssl certificate should support artifactory-ha fullname
-* Added 'multiPartLimit' and 'multipartElementSize' parameters to awsS3V3 binary providers.
+* Fixed jfconnect disabling as micro-service on splitcontainers [GH-1806](https://github.com/jfrog/charts/issues/1806)
 
 ## [107.62.0] - Jun 5, 2023
 * Added support for 'port' and 'useHttp' parameters for s3-storage-v3 binary provider [GH-1767](https://github.com/jfrog/charts/issues/1767)

diff --git a/stable/artifactory-ha/Chart.yaml b/stable/artifactory-ha/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 7.63.14
+appVersion: 7.68.7
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -21,4 +21,4 @@ name: artifactory-ha
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.63.14
+version: 107.68.7
diff --git a/stable/artifactory-ha/ci/default-values.yaml b/stable/artifactory-ha/ci/default-values.yaml
@@ -14,6 +14,9 @@ artifactory:
       limits:
         memory: "6Gi"
         cpu: "4"
+    javaOpts:
+      xms: "4g"
+      xmx: "4g"
   node:
     resources:
       requests:
@@ -22,9 +25,6 @@ artifactory:
       limits:
         memory: "6Gi"
         cpu: "4"
-  javaOpts:
-    xms: "4g"
-    xmx: "4g"
 # To Fix ct tool --reuse-values - PASSWORDS ERROR: you must provide your current passwords when upgrade the release
 postgresql:
   postgresqlPassword: password

diff --git a/stable/artifactory-ha/ci/global-values.yaml b/stable/artifactory-ha/ci/global-values.yaml
@@ -10,6 +10,9 @@ artifactory:
       limits:
         memory: "6Gi"
         cpu: "4"
+    javaOpts:
+      xms: "4g"
+      xmx: "4g"
   node:
     resources:
       requests:
@@ -18,9 +21,6 @@ artifactory:
       limits:
         memory: "6Gi"
         cpu: "4"
-  javaOpts:
-    xms: "4g"
-    xmx: "4g"
   customInitContainersBegin: |
    - name: "custom-init-begin-local"
      image: "{{ .Values.initContainerImage }}"
@@ -231,7 +231,7 @@ nginx:
         proxy_set_header    X-Forwarded-Proto $http_x_forwarded_proto;
         proxy_set_header    Host              $http_host;
         proxy_set_header    X-Forwarded-For   $proxy_add_x_forwarded_for;
-        add_header Strict-Transport-Security always;
+        add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
 
         location /artifactory/ {
           if ( $request_uri ~ ^/artifactory/(.*)$ ) {

diff --git a/stable/artifactory-ha/ci/migration-disabled-values.yaml b/stable/artifactory-ha/ci/migration-disabled-values.yaml
@@ -18,6 +18,9 @@ artifactory:
       limits:
         memory: "6Gi"
         cpu: "4"
+    javaOpts:
+      xms: "4g"
+      xmx: "4g"
   node:
     resources:
       requests:
@@ -26,6 +29,3 @@ artifactory:
       limits:
         memory: "6Gi"
         cpu: "4"
-  javaOpts:
-    xms: "4g"
-    xmx: "4g"
diff --git a/stable/artifactory-ha/ci/nginx-autoreload-values.yaml b/stable/artifactory-ha/ci/nginx-autoreload-values.yaml
@@ -14,6 +14,9 @@ artifactory:
       limits:
         memory: "6Gi"
         cpu: "4"
+    javaOpts:
+      xms: "4g"
+      xmx: "4g"
   node:
     resources:
       requests:
@@ -22,9 +25,6 @@ artifactory:
       limits:
         memory: "6Gi"
         cpu: "4"
-  javaOpts:
-    xms: "4g"
-    xmx: "4g"
 # To Fix ct tool --reuse-values - PASSWORDS ERROR: you must provide your current passwords when upgrade the release
 postgresql:
   postgresqlPassword: password

diff --git a/stable/artifactory-ha/ci/rtsplit-values.yaml b/stable/artifactory-ha/ci/rtsplit-values.yaml
@@ -30,6 +30,9 @@ artifactory:
       limits:
         memory: "6Gi"
         cpu: "4"
+    javaOpts:
+      xms: "4g"
+      xmx: "4g"
   node:
     resources:
       requests:
@@ -38,9 +41,6 @@ artifactory:
       limits:
         memory: "6Gi"
         cpu: "4"
-  javaOpts:
-    xms: "4g"
-    xmx: "4g"
 
   # Add lifecycle hooks for artifactory container
   lifecycle:

diff --git a/stable/artifactory-ha/ci/test-values.yaml b/stable/artifactory-ha/ci/test-values.yaml
@@ -25,6 +25,9 @@ artifactory:
       limits:
         memory: "6Gi"
         cpu: "4"
+    javaOpts:
+      xms: "4g"
+      xmx: "4g"
   node:
     resources:
       requests:
@@ -33,9 +36,6 @@ artifactory:
       limits:
         memory: "6Gi"
         cpu: "4"
-  javaOpts:
-    xms: "4g"
-    xmx: "4g"
   statefulset:
     annotations:
       artifactory: test
@@ -59,6 +59,9 @@ ingress:
 nginx:
   enabled: false
 
+jfconnect:
+  enabled: false
+
 ## filebeat sidecar
 filebeat:
   enabled: true

diff --git a/stable/artifactory-ha/templates/artifactory-node-statefulset.yaml b/stable/artifactory-ha/templates/artifactory-node-statefulset.yaml
@@ -740,6 +740,66 @@ spec:
       {{- if .Values.integration.livenessProbe.enabled }}
         livenessProbe:
 {{ tpl .Values.integration.livenessProbe.config . | indent 10 }}
+      {{- end }}
+      {{- end }}
+      {{- if .Values.federation.enabled }}
+      - name: {{ .Values.federation.name }}
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "artifactory") }}
+        imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | indent 10 }}
+      {{- end }}
+        command:
+          - '/bin/bash'
+          - '-c'
+          - >
+            exec /opt/jfrog/artifactory/app/third-party/java/bin/java {{ .Values.federation.extraJavaOpts }} -jar /opt/jfrog/artifactory/app/rtfs/lib/jf-rtfs
+        {{- with .Values.federation.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+        {{- end }}
+        env:
+        - name: JF_SHARED_NODE_ID
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+      {{ if or .Values.database.secrets.password .Values.database.password .Values.postgresql.enabled }}
+        - name: JF_RTFS_DATABASE_PASSWORD
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.password }}
+              name: {{ tpl .Values.database.secrets.password.name . }}
+              key: {{ tpl .Values.database.secrets.password.key . }}
+        {{- else if .Values.database.password }}
+            {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
+            {{- else }}
+              name: "{{ template "artifactory-ha.name" . }}-unified-secret"
+            {{- end }}
+              key: db-password
+        {{- else if .Values.postgresql.enabled }}
+              name: {{ .Release.Name }}-postgresql
+              key: postgresql-password
+        {{- end }}
+      {{- end }}
+{{- with .Values.federation.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 8 }}
+{{- end }}
+        ports:
+        - containerPort: {{ .Values.federation.internalPort }}
+          name: http-rtfs
+        volumeMounts:
+        - name: volume
+          mountPath: {{ .Values.artifactory.persistence.mountPath | quote }}
+        resources:
+{{ toYaml .Values.federation.resources | indent 10 }}
+      {{- if .Values.federation.startupProbe.enabled }}
+        startupProbe:
+{{ tpl .Values.federation.startupProbe.config . | indent 10 }}
+      {{- end }}
+      {{- if .Values.federation.livenessProbe.enabled }}
+        livenessProbe:
+{{ tpl .Values.federation.livenessProbe.config . | indent 10 }}
       {{- end }}
       {{- end }}
       {{- if .Values.observability.enabled }}
@@ -842,12 +902,12 @@ spec:
           value: "true"
         - name: JF_REPLICATOR_SERVICE_ENABLED
           value: "false"
+        - name: JF_FEDERATION_ENABLED
+          value: "false"
         - name : JF_OBSERVABILITY_ENABLED
           value: "false"
         - name : JF_JFCONNECT_SERVICE_ENABLED
           value: "false"
-        - name : JF_JFCONNECT_ENABLED
-          value: "true"
         - name : JF_INTEGRATION_ENABLED
           value: "false"
       {{- end }}
@@ -916,6 +976,8 @@ spec:
           name: http
         - containerPort: {{ .Values.artifactory.internalArtifactoryPort }}
           name: http-internal
+        - containerPort: {{ .Values.federation.internalPort }}
+          name: http-rtfs
         {{- if .Values.artifactory.node.javaOpts.jmx.enabled }}
         - containerPort: {{ .Values.artifactory.node.javaOpts.jmx.port }}
           name: tcp-jmx

diff --git a/stable/artifactory-ha/templates/artifactory-primary-statefulset.yaml b/stable/artifactory-ha/templates/artifactory-primary-statefulset.yaml
@@ -830,6 +830,48 @@ spec:
       {{- if .Values.integration.livenessProbe.enabled }}
         livenessProbe:
 {{ tpl .Values.integration.livenessProbe.config . | indent 10 }}
+      {{- end }}
+      {{- end }}
+      {{- if .Values.federation.enabled }}
+      - name: {{ .Values.federation.name }}
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "artifactory") }}
+        imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+          - '/bin/bash'
+          - '-c'
+          - >
+            exec /opt/jfrog/artifactory/app/third-party/java/bin/java {{ .Values.federation.extraJavaOpts }} -jar /opt/jfrog/artifactory/app/rtfs/lib/jf-rtfs
+        {{- with .Values.federation.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+        {{- end }}
+        env:
+        - name: JF_SHARED_NODE_ID
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+      # TODO - Password,Url,Username - should be derived from env variable
+{{- with .Values.federation.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 8 }}
+{{- end }}
+        ports:
+        - containerPort: {{ .Values.federation.internalPort }}
+          name: http-rtfs
+        volumeMounts:
+        - name: volume
+          mountPath: {{ .Values.artifactory.persistence.mountPath | quote }}
+        resources:
+{{ toYaml .Values.federation.resources | indent 10 }}
+      {{- if .Values.federation.startupProbe.enabled }}
+        startupProbe:
+{{ tpl .Values.federation.startupProbe.config . | indent 10 }}
+      {{- end }}
+      {{- if .Values.federation.livenessProbe.enabled }}
+        livenessProbe:
+{{ tpl .Values.federation.livenessProbe.config . | indent 10 }}
       {{- end }}
       {{- end }}
       {{- if .Values.observability.enabled }}
@@ -944,12 +986,12 @@ spec:
           value: "true"
         - name: JF_REPLICATOR_SERVICE_ENABLED
           value: "false"
+        - name: JF_FEDERATION_ENABLED
+          value: "false"
         - name : JF_OBSERVABILITY_ENABLED
           value: "false"
         - name : JF_JFCONNECT_SERVICE_ENABLED
           value: "false"
-        - name : JF_JFCONNECT_ENABLED
-          value: "true"
         - name : JF_INTEGRATION_ENABLED
           value: "false"
       {{- end }}
@@ -1018,6 +1060,8 @@ spec:
           name: http
         - containerPort: {{ .Values.artifactory.internalArtifactoryPort }}
           name: http-internal
+        - containerPort: {{ .Values.federation.internalPort }}
+          name: http-rtfs
         {{- if .Values.artifactory.primary.javaOpts.jmx.enabled }}
         - containerPort: {{ .Values.artifactory.primary.javaOpts.jmx.port }}
           name: tcp-jmx