[jfrog-platform] 10.18.1 release

jfrog · May 27, 2024 · 96570b8 · 96570b8
1 parent b51b8e4
commit 96570b8
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 19 deletions.
diff --git a/stable/jfrog-platform/CHANGELOG.md b/stable/jfrog-platform/CHANGELOG.md
@@ -1,6 +1,11 @@
 # JFrog Platform Chart Changelog (GA releases only)
 All changes to this chart will be documented in this file.
 
+## [10.18.1] - May 26, 2024
+* Update dependency artifactory chart version to 107.84.12
+* Update dependency xray chart version to 103.95.7
+* Fixed an issue related to chart fullname when unifiedSecretInstallation is set to false [GH-1882](https://github.com/jfrog/charts/issues/1882)
+
 ## [10.18.0] - May 12, 2024
 * **Important change:**
 * Distribution, Insight and Pipelines are disabled by default, if you are using these products from previous release, enable them using your custom-values.yaml file.
@@ -34,11 +39,6 @@ All changes to this chart will be documented in this file.
 ## [10.17.1] - Feb 29, 2024
 * Updated README.md to create a namespace using `--create-namespace` as part of helm install
 * Updated `artifactory.installerInfo` content
-* Update dependency artifactory chart version to 107.77.6
-* Update dependency xray chart version to 103.90.1
-* Update dependency distribution chart version to 102.22.2
-* Update dependency insight chart version to 101.16.7
-* Update dependency pipelines chart version to 101.55.6
 
 ## [10.17.0] - Jan 24, 2023
 * **IMPORTANT**

diff --git a/stable/jfrog-platform/Chart.lock b/stable/jfrog-platform/Chart.lock
@@ -7,18 +7,18 @@ dependencies:
   version: 11.9.3
 - name: artifactory
   repository: https://charts.jfrog.io/
-  version: 107.84.10
+  version: 107.84.12
 - name: xray
   repository: https://charts.jfrog.io/
-  version: 103.94.6
+  version: 103.95.7
 - name: distribution
   repository: https://charts.jfrog.io/
-  version: 102.24.0
+  version: 102.25.1
 - name: insight
   repository: https://charts.jfrog.io/
   version: 101.16.7
 - name: pipelines
   repository: https://charts.jfrog.io/
-  version: 101.56.6
-digest: sha256:5cde5b136403c096e4ebf13a3008248dcf3f95ce7109c74d9d78c3c505c3e012
-generated: "2024-05-12T22:41:47.381211+05:30"
+  version: 101.59.7
+digest: sha256:56341c74ca4be940df92302c2bb4cdcb05b3dc3105f63170e73e1ce11db035d3
+generated: "2024-05-26T20:20:26.257789+05:30"
diff --git a/stable/jfrog-platform/Chart.yaml b/stable/jfrog-platform/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 7.84.10
+appVersion: 7.84.12
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -12,23 +12,23 @@ dependencies:
 - condition: artifactory.enabled
   name: artifactory
   repository: https://charts.jfrog.io/
-  version: 107.84.10
+  version: 107.84.12
 - condition: xray.enabled
   name: xray
   repository: https://charts.jfrog.io/
-  version: 103.94.6
+  version: 103.95.7
 - condition: distribution.enabled
   name: distribution
   repository: https://charts.jfrog.io/
-  version: 102.24.0
+  version: 102.25.1
 - condition: insight.enabled
   name: insight
   repository: https://charts.jfrog.io/
   version: 101.16.7
 - condition: pipelines.enabled
   name: pipelines
   repository: https://charts.jfrog.io/
-  version: 101.56.6
+  version: 101.59.7
 description: The Helm chart for JFrog Platform (Universal, hybrid, end-to-end DevOps
   automation)
 home: https://jfrog.com/platform/
@@ -50,4 +50,4 @@ name: jfrog-platform
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 10.18.0
+version: 10.18.1
diff --git a/stable/jfrog-platform/templates/_helpers.tpl b/stable/jfrog-platform/templates/_helpers.tpl
@@ -74,6 +74,40 @@ imagePullSecrets:
 {{- end -}}
 {{- end -}}
 
+{{/*
+Reslove Unified Secret name
+*/}}
+{{- define "jfrog-platform.unifiedSecretInstallation" -}}
+{{- if eq .Chart.Name "artifactory" -}}
+{{- if not .Values.artifactory.unifiedSecretInstallation }}
+{{- printf "%s-%s" (include "artifactory.fullname" .) "database-creds" -}}
+{{- else }}
+{{- printf "%s-%s" (include "artifactory.fullname" .) "unified-secret" -}}
+{{- end }}
+{{- end -}}
+{{- if eq .Chart.Name "distribution" -}}
+{{- if not .Values.distribution.unifiedSecretInstallation }}
+{{- printf "%s-%s" (include "distribution.fullname" . ) "database-creds" -}}
+{{- else }}
+{{- printf "%s-%s" (include "distribution.fullname" .) "unified-secret" -}}
+{{- end }}
+{{- end -}}
+{{- if eq .Chart.Name "xray" -}}
+{{- if not .Values.xray.unifiedSecretInstallation }}
+{{- printf "%s-%s" (include "xray.fullname" . ) "database-creds" -}}
+{{- else }}
+{{- printf "%s-%s" (include "xray.name" .) "unified-secret" -}}
+{{- end }}
+{{- end -}}
+{{- if eq .Chart.Name "insight" -}}
+{{- if not .Values.insightServer.unifiedSecretInstallation }}
+{{- printf "%s-%s" (include "insight.fullname" . ) "database-creds" -}}
+{{- else }}
+{{- printf "%s-%s" (include "insight.name" .) "unified-secret" -}}
+{{- end }}
+{{- end -}}
+{{- end -}}
+
 {{/*
 Custom init container for Postgres setup
 */}}
@@ -154,7 +188,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 }}
-          name: {{ .Chart.Name }}-unified-secret
+          name: {{ include "jfrog-platform.unifiedSecretInstallation" . }}
           key: db-user
     {{- end }}
     - name: DB_PASSWORD
@@ -164,7 +198,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 }}
-          name: {{ .Chart.Name }}-unified-secret
+          name: {{ include "jfrog-platform.unifiedSecretInstallation" . }}
           key: db-password
     {{- end }}
     - name: PGPASSWORD