[jfrog-platform] 10.15.0 release

stable/jfrog-platform/CHANGELOG.md

@@ -1,6 +1,17 @@
 # JFrog Platform Chart Changelog (GA releases only)
 All changes to this chart will be documented in this file.
 
+## [10.15.0] - Sep 12, 2023
+**IMPORTANT**
+* Enabled `unifiedSecretInstallation` to true by default,which enables single unified secret holding all of each product secrets
+* Update dependency artifactory chart version to 107.68.7
+* Update dependency xray chart version to 103.82.6
+* Update dependency distribution chart version to 102.20.1
+* Fixed - Support to configure privateRegistry for xray pre-upgrade-hook
+* Fixed rabbitmq feature flag conditions for pre-upgrade hook command execution
+* Updated redis version to `7.2.0-debian-11-r2`
+* Update global.versions.router version to `7.78.0`
+
 ## [10.14.8] - Aug 29, 2023
 * Update dependency artifactory chart version to 107.63.14
 * Update dependency insight chart version to 101.15.3

stable/jfrog-platform/Chart.lock

@@ -10,13 +10,13 @@ dependencies:
   version: 12.10.1
 - name: artifactory
   repository: https://charts.jfrog.io/
-  version: 107.63.14
+  version: 107.68.7
 - name: xray
   repository: https://charts.jfrog.io/
-  version: 103.80.9
+  version: 103.82.6
 - name: distribution
   repository: https://charts.jfrog.io/
-  version: 102.19.1
+  version: 102.20.1
 - name: insight
   repository: https://charts.jfrog.io/
   version: 101.15.3
@@ -26,5 +26,5 @@ dependencies:
 - name: pipelines
   repository: https://charts.jfrog.io/
   version: 101.43.2
-digest: sha256:634e4b12012125224d36353c170c561dbf2dd1d41180a5a3d45f65d7078e1666
-generated: "2023-08-29T16:23:26.687789+05:30"
+digest: sha256:990eca96be356f9f6c9831e38d84114481395cbb3de6ccfe2bf2e3e9dcb3096a
+generated: "2023-09-12T06:35:05.322817+05:30"

stable/jfrog-platform/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 7.63.14
+appVersion: 7.68.7
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -16,15 +16,15 @@ dependencies:
 - condition: artifactory.enabled
   name: artifactory
   repository: https://charts.jfrog.io/
-  version: 107.63.14
+  version: 107.68.7
 - condition: xray.enabled
   name: xray
   repository: https://charts.jfrog.io/
-  version: 103.80.9
+  version: 103.82.6
 - condition: distribution.enabled
   name: distribution
   repository: https://charts.jfrog.io/
-  version: 102.19.1
+  version: 102.20.1
 - condition: insight.enabled
   name: insight
   repository: https://charts.jfrog.io/
@@ -59,4 +59,4 @@ name: jfrog-platform
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 10.14.8
+version: 10.15.0

stable/jfrog-platform/templates/_helpers.tpl

@@ -62,6 +62,35 @@ Create the name of the service account to use
 {{- end }}
 {{- end }}
 
+{{/*
+Return the registry of a service
+*/}}
+{{- define "jfrog-platform.getRegistryByService" -}}
+{{- $dot := index . 0 }}
+{{- $service := index . 1 }}
+{{- if $dot.Values.global.imageRegistry }}
+    {{- $dot.Values.global.imageRegistry }}
+{{- else -}}
+    {{- if (eq $service "migrationHook") -}}
+      {{- index $dot.Values.rabbitmq.migration.image.registry -}}
+   {{- else -}}
+      {{- index $dot.Values $service "image" "registry" -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve imagePullSecrets value
+*/}}
+{{- define "jfrog-platform.imagePullSecrets" -}}
+{{- if .Values.global.imagePullSecrets }}
+imagePullSecrets:
+{{- range .Values.global.imagePullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- end -}}
+{{- end -}}
+
 {{/*
 Custom init container for Postgres setup
 */}}
@@ -143,8 +172,7 @@ Custom init container for Postgres setup
           name: {{ tpl .Values.database.secrets.user.name . }}
           key: {{ tpl .Values.database.secrets.user.key . }}
     {{- else if .Values.database.user }}
-    {{- $chartFullName := printf "%s.fullname" .Chart.Name }}
-          name: {{ include $chartFullName . }}-database-creds
+          name: {{ .Chart.Name }}-unified-secret
           key: db-user
     {{- end }}
     - name: DB_PASSWORD
@@ -154,8 +182,7 @@ Custom init container for Postgres setup
           name: {{ tpl .Values.database.secrets.password.name . }}
           key: {{ tpl .Values.database.secrets.password.key . }}
     {{- else if .Values.database.password }}
-    {{- $chartFullName := printf "%s.fullname" .Chart.Name }}
-          name: {{ include $chartFullName . }}-database-creds
+          name: {{ .Chart.Name }}-unified-secret
           key: db-password
     {{- end }}
     - name: PGPASSWORD

stable/jfrog-platform/templates/migration-hook.yaml

@@ -85,14 +85,32 @@ spec:
   {{- if .Values.rabbitmq.podSecurityContext.enabled }}
   securityContext: {{- omit .Values.rabbitmq.podSecurityContext "enabled" | toYaml | nindent 4 }}
   {{- end }}
+  {{- if .Values.global.imagePullSecrets }}
+  {{- include "jfrog-platform.imagePullSecrets" . | indent 2 }}
+  {{- end }}
   containers:
     - name: pre-upgrade-container
-      image: releases-docker.jfrog.io/bitnami/kubectl:1.24.12
+      image: "{{ include "jfrog-platform.getRegistryByService" (list . "migrationHook") }}/{{ .Values.rabbitmq.migration.image.repository }}:{{ .Values.rabbitmq.migration.image.tag }}"
       imagePullPolicy: IfNotPresent
       {{- if .Values.rabbitmq.containerSecurityContext.enabled }}
       securityContext: {{- tpl (omit .Values.rabbitmq.containerSecurityContext "enabled" | toYaml) . | nindent 10 }}
       {{- end }}
-      command: ['sh', '-c', 'kubectl exec -it {{ .Release.Name }}-{{ template "rabbitmq.name" . }}-0 -- rabbitmqctl enable_feature_flag all ; if [ "$?" -ne 0 ]; then echo "Failed to perform the migration. Please make sure to enable the feature flag in rabbitmq manually [rabbitmqctl enable_feature_flag all] "; exit 1; fi' ]
+      command:
+        - sh
+        - -c
+        - |
+            #!/bin/sh
+            if [ "$(kubectl get pods -l "app.kubernetes.io/name={{ template "rabbitmq.name" . }}" -o jsonpath='{..status.conditions[?(@.type=="Ready")].status}')" = "True" ]; then
+                kubectl exec -it {{ .Release.Name }}-{{ template "rabbitmq.name" . }}-0 -- rabbitmqctl enable_feature_flag all
+                if [ "$?" -ne 0 ]; then
+                   echo "Failed to perform the migration. Please make sure to enable the feature flag in rabbitmq manually [rabbitmqctl enable_feature_flag all] "
+                   exit 1
+                else
+                   echo Feature flags executed successfully!
+                fi
+            else
+                echo "Rabbitmq pod is not in running state. Ignoring feature flag migration for rabbitmq"
+            fi
   restartPolicy: Never
   terminationGracePeriodSeconds: 0
 {{- end }}

stable/jfrog-platform/values.yaml

@@ -23,7 +23,7 @@ global:
   ## For example : For artifactory, using global.versions.artifactory
   ## Note: Order of preference is 1) global.versions 2) .Values.artifactory.image.tag 3) Chart.AppVersion
   versions:
-    router: 7.76.0
+    router: 7.78.0
   #   artifactory:
   #   xray:
   #   distribution:
@@ -178,6 +178,10 @@ rabbitmq:
   migration:
     ## Migration is required to be performed only once hence this option can be disabled once the feature flags are enabled in rabbitmq.
     enabled: true
+    image:
+      registry: releases-docker.jfrog.io
+      repository: bitnami/kubectl
+      tag: 1.24.12
     ## Service account for the pre-upgrade hook to perform rabbitmq migration
     serviceAccount:
       create: true
@@ -212,14 +216,15 @@ redis:
   enabled: true
   image:
     repository: bitnami/redis
-    tag: 7.0.9-debian-11-r6
+    tag: 7.2.0-debian-11-r2
   cluster:
     enabled: false
   usePassword: false
 
 artifactory:
-  installerInfo: '{"productId": "Helm_JFrogPlatform/{{ printf "10.14.8-%s" .Chart.AppVersion  }}", "features": [ { "featureId": "Platform/{{ printf "%s-%s" "kubernetes" .Capabilities.KubeVersion.Version }}"}]}'
   enabled: true
+  unifiedUpgradeAllowed: true
+  installerInfo: '{"productId": "Helm_JFrogPlatform/{{ printf "10.15.0-%s" .Chart.AppVersion  }}", "features": [ { "featureId": "Platform/{{ printf "%s-%s" "kubernetes" .Capabilities.KubeVersion.Version }}"}]}'
   postgresql:
     enabled: false
   waitForDatabase: false
@@ -233,6 +238,7 @@ artifactory:
   mc:
     enabled: true
   artifactory:
+    unifiedSecretInstallation: true
     # Note: For HA deployments, set replicaCount >1 (recommended 3)
     replicaCount: 1
     migration:
@@ -246,6 +252,8 @@ artifactory:
 xray:
   enabled: true
   unifiedUpgradeAllowed: true
+  xray:
+    unifiedSecretInstallation: true
   postgresql:
     enabled: false
   database:
@@ -271,18 +279,21 @@ xray:
 distribution:
   enabled: true
   unifiedUpgradeAllowed: true
+  distribution:
+    unifiedSecretInstallation: true
   postgresql:
     enabled: false
-  image:
-    tag: 7.0.9-debian-11-r6
   database:
     url: '{{ include "database.url" . }}'
     user: distribution
     password: distribution
 
+
 insight:
   enabled: true
   unifiedUpgradeAllowed: true
+  insightServer:
+    unifiedSecretInstallation: true
   postgresql:
     enabled: false
   database:
@@ -308,6 +319,7 @@ pipelines:
       user: "apiuser"
       password: "pipeline"
   pipelines:
+    unifiedSecretInstallation: true
     msg:
       uiUserPassword: password
   redis: