[pipelines] 1.56.6 release

fwdIT · May 13, 2024 · 7fcd383 · 7fcd383
1 parent f1e3378
commit 7fcd383
Show file tree

Hide file tree

Showing 11 changed files with 78 additions and 75 deletions.
diff --git a/stable/pipelines/CHANGELOG.md b/stable/pipelines/CHANGELOG.md
@@ -1,7 +1,10 @@
 # JFrog Pipelines Chart Changelog
 All changes to this chart to be documented in this file.
 
-## [101.55.6] - Dec 28, 2023
+## [101.56.6] - Jan 31, 2024
+* Fixes in external secret support on unified secret installation
+
+## [101.55.0] - Dec 28, 2023
 * Handled #redis postfix is ommited from redis service name if it contains redis 
 
 ## [101.54.0] - Dec 21, 2023

diff --git a/stable/pipelines/Chart.yaml b/stable/pipelines/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.55.6
+appVersion: 1.56.6
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -32,4 +32,4 @@ name: pipelines
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 101.55.6
+version: 101.56.6
diff --git a/stable/pipelines/templates/pipelines-cron-statefulset.yaml b/stable/pipelines/templates/pipelines-cron-statefulset.yaml
@@ -98,7 +98,7 @@ spec:
           - name: jfrog-pipelines-folder
             mountPath: {{ .Values.pipelines.mountPath }}
         {{- if or .Values.systemYamlOverride.existingSecret .Values.pipelines.systemYaml }}
-          {{- if not .Values.pipelines.unifiedSecretInstallation }}
+          {{- if or (not .Values.pipelines.unifiedSecretInstallation) .Values.systemYamlOverride.existingSecret }}
           - name: systemyaml
           {{- else }}
           - name: {{ include "pipelines.unifiedCustomSecretVolumeName" . }}
@@ -221,7 +221,7 @@ spec:
             - name: PIPELINES_MASTER_KEY
               valueFrom:
                 secretKeyRef:
-                {{- if not .Values.pipelines.unifiedSecretInstallation }}
+                {{- if or (not .Values.pipelines.unifiedSecretInstallation) .Values.pipelines.masterKeySecretName .Values.global.masterKeySecretName }}
                   name: "{{ include "pipelines.masterKeySecretName" . }}"
                 {{- else }}
                   name: "{{ template "pipelines.name" . }}-unified-secret"
@@ -232,7 +232,7 @@ spec:
             - name: PIPELINES_JOIN_KEY
               valueFrom:
                 secretKeyRef:
-                {{- if not .Values.pipelines.unifiedSecretInstallation }}
+                {{- if or (not .Values.pipelines.unifiedSecretInstallation) .Values.pipelines.joinKeySecretName .Values.global.joinKeySecretName }}
                   name: "{{ include "pipelines.joinKeySecretName" . }}"
                 {{- else }}
                   name: "{{ template "pipelines.name" . }}-unified-secret"
@@ -260,7 +260,7 @@ spec:
           - name: jfrog-pipelines-logs
             mountPath: {{ .Values.pipelines.logPath }}
           {{- if .Values.buildPlane.dynamic.provider.aws.enabled }}
-          {{- if not .Values.pipelines.unifiedSecretInstallation }}
+          {{- if or (not .Values.pipelines.unifiedSecretInstallation) .Values.buildPlane.dynamic.provider.aws.existingSecret }}
           - name: buildplane-creds-aws
           {{- else }}
           - name: {{ include "pipelines.unifiedCustomSecretVolumeName" . }}
@@ -272,7 +272,7 @@ spec:
             readOnly: true
           {{- end }}
           {{- if .Values.buildPlane.dynamic.provider.k8s.enabled }}
-          {{- if not .Values.pipelines.unifiedSecretInstallation }}
+          {{- if or (not .Values.pipelines.unifiedSecretInstallation) .Values.buildPlane.dynamic.provider.k8s.existingSecret }}
           - name: buildplane-creds-k8s
           {{- else }}
           - name: {{ include "pipelines.unifiedCustomSecretVolumeName" . }}
@@ -349,7 +349,7 @@ spec:
               {{- if or .Values.pipelines.joinKeySecretName .Values.global.joinKeySecretName }}
               valueFrom:
                 secretKeyRef:
-                {{- if not .Values.pipelines.unifiedSecretInstallation }}
+                {{- if or (not .Values.pipelines.unifiedSecretInstallation) .Values.pipelines.joinKeySecretName .Values.global.joinKeySecretName }}
                   name: "{{ include "pipelines.joinKeySecretName" . }}"
                 {{- else }}
                   name: "{{ template "pipelines.name" . }}-unified-secret"
@@ -411,7 +411,7 @@ spec:
             - name: JF_SHARED_SECURITY_MASTERKEY
               valueFrom:
                 secretKeyRef:
-                {{- if not .Values.pipelines.unifiedSecretInstallation }}
+                {{- if or (not .Values.pipelines.unifiedSecretInstallation) .Values.pipelines.masterKeySecretName .Values.global.masterKeySecretName }}
                   name: "{{ include "pipelines.masterKeySecretName" . }}"
                 {{- else }}
                   name: "{{ template "pipelines.name" . }}-unified-secret"
@@ -420,7 +420,7 @@ spec:
             - name: JF_SHARED_SECURITY_JOINKEY
               valueFrom:
                 secretKeyRef:
-                {{- if not .Values.pipelines.unifiedSecretInstallation }}
+                {{- if or (not .Values.pipelines.unifiedSecretInstallation) .Values.pipelines.joinKeySecretName .Values.global.joinKeySecretName }}
                   name: "{{ include "pipelines.joinKeySecretName" . }}"
                 {{- else }}
                   name: "{{ template "pipelines.name" . }}-unified-secret"

diff --git a/stable/pipelines/templates/pipelines-hookhandler-statefulset.yaml b/stable/pipelines/templates/pipelines-hookhandler-statefulset.yaml
@@ -102,7 +102,7 @@ spec:
           - name: jfrog-pipelines-folder
             mountPath: {{ .Values.pipelines.mountPath }}
         {{- if or .Values.systemYamlOverride.existingSecret .Values.pipelines.systemYaml }}
-          {{- if not .Values.pipelines.unifiedSecretInstallation }}
+          {{- if or (not .Values.pipelines.unifiedSecretInstallation) .Values.systemYamlOverride.existingSecret }}
           - name: systemyaml
           {{- else }}
           - name: {{ include "pipelines.unifiedCustomSecretVolumeName" . }}
@@ -225,7 +225,7 @@ spec:
             - name: PIPELINES_MASTER_KEY
               valueFrom:
                 secretKeyRef:
-                {{- if not .Values.pipelines.unifiedSecretInstallation }}
+                {{- if or (not .Values.pipelines.unifiedSecretInstallation) .Values.pipelines.masterKeySecretName .Values.global.masterKeySecretName }}
                   name: "{{ include "pipelines.masterKeySecretName" . }}"
                 {{- else }}
                   name: "{{ template "pipelines.name" . }}-unified-secret"
@@ -236,7 +236,7 @@ spec:
             - name: PIPELINES_JOIN_KEY
               valueFrom:
                 secretKeyRef:
-                {{- if not .Values.pipelines.unifiedSecretInstallation }}
+                {{- if or (not .Values.pipelines.unifiedSecretInstallation) .Values.pipelines.joinKeySecretName .Values.global.joinKeySecretName }}
                   name: "{{ include "pipelines.joinKeySecretName" . }}"
                 {{- else }}
                   name: "{{ template "pipelines.name" . }}-unified-secret"
@@ -264,7 +264,7 @@ spec:
           - name: jfrog-pipelines-logs
             mountPath: {{ .Values.pipelines.logPath }}
           {{- if .Values.buildPlane.dynamic.provider.aws.enabled }}
-          {{- if not .Values.pipelines.unifiedSecretInstallation }}
+          {{- if or (not .Values.pipelines.unifiedSecretInstallation) .Values.buildPlane.dynamic.provider.aws.existingSecret }}
           - name: buildplane-creds-aws
           {{- else }}
           - name: {{ include "pipelines.unifiedCustomSecretVolumeName" . }}
@@ -276,7 +276,7 @@ spec:
             readOnly: true
           {{- end }}
           {{- if .Values.buildPlane.dynamic.provider.k8s.enabled }}
-          {{- if not .Values.pipelines.unifiedSecretInstallation }}
+          {{- if or (not .Values.pipelines.unifiedSecretInstallation) .Values.buildPlane.dynamic.provider.k8s.existingSecret }}
           - name: buildplane-creds-k8s
           {{- else }}
           - name: {{ include "pipelines.unifiedCustomSecretVolumeName" . }}
@@ -353,7 +353,7 @@ spec:
               {{- if or .Values.pipelines.joinKeySecretName .Values.global.joinKeySecretName }}
               valueFrom:
                 secretKeyRef:
-                {{- if not .Values.pipelines.unifiedSecretInstallation }}
+                {{- if or (not .Values.pipelines.unifiedSecretInstallation) .Values.pipelines.joinKeySecretName .Values.global.joinKeySecretName }}
                   name: "{{ include "pipelines.joinKeySecretName" . }}"
                 {{- else }}
                   name: "{{ template "pipelines.name" . }}-unified-secret"
@@ -415,7 +415,7 @@ spec:
             - name: JF_SHARED_SECURITY_MASTERKEY
               valueFrom:
                 secretKeyRef:
-                {{- if not .Values.pipelines.unifiedSecretInstallation }}
+                {{- if or (not .Values.pipelines.unifiedSecretInstallation) .Values.pipelines.masterKeySecretName .Values.global.masterKeySecretName }}
                   name: "{{ include "pipelines.masterKeySecretName" . }}"
                 {{- else }}
                   name: "{{ template "pipelines.name" . }}-unified-secret"
@@ -424,7 +424,7 @@ spec:
             - name: JF_SHARED_SECURITY_JOINKEY
               valueFrom:
                 secretKeyRef:
-                {{- if not .Values.pipelines.unifiedSecretInstallation }}
+                {{- if or (not .Values.pipelines.unifiedSecretInstallation) .Values.pipelines.joinKeySecretName .Values.global.joinKeySecretName }}
                   name: "{{ include "pipelines.joinKeySecretName" . }}"
                 {{- else }}
                   name: "{{ template "pipelines.name" . }}-unified-secret"

diff --git a/stable/pipelines/templates/pipelines-internalapi-statefulset.yaml b/stable/pipelines/templates/pipelines-internalapi-statefulset.yaml
@@ -91,7 +91,7 @@ spec:
           - name: jfrog-pipelines-folder
             mountPath: {{ .Values.pipelines.mountPath }}
         {{- if or .Values.systemYamlOverride.existingSecret .Values.pipelines.systemYaml }}
-          {{- if not .Values.pipelines.unifiedSecretInstallation }}
+          {{- if or (not .Values.pipelines.unifiedSecretInstallation) .Values.systemYamlOverride.existingSecret }}
           - name: systemyaml
           {{- else }}
           - name: {{ include "pipelines.unifiedCustomSecretVolumeName" . }}
@@ -286,7 +286,7 @@ spec:
             - name: PIPELINES_MASTER_KEY
               valueFrom:
                 secretKeyRef:
-                {{- if not .Values.pipelines.unifiedSecretInstallation }}
+                {{- if or (not .Values.pipelines.unifiedSecretInstallation) .Values.pipelines.masterKeySecretName .Values.global.masterKeySecretName }}
                   name: "{{ include "pipelines.masterKeySecretName" . }}"
                 {{- else }}
                   name: "{{ template "pipelines.name" . }}-unified-secret"
@@ -297,7 +297,7 @@ spec:
             - name: PIPELINES_JOIN_KEY
               valueFrom:
                 secretKeyRef:
-                {{- if not .Values.pipelines.unifiedSecretInstallation }}
+                {{- if or (not .Values.pipelines.unifiedSecretInstallation) .Values.pipelines.joinKeySecretName .Values.global.joinKeySecretName }}
                   name: "{{ include "pipelines.joinKeySecretName" . }}"
                 {{- else }}
                   name: "{{ template "pipelines.name" . }}-unified-secret"
@@ -345,7 +345,7 @@ spec:
           - name: jfrog-pipelines-logs
             mountPath: {{ .Values.pipelines.logPath }}
           {{- if .Values.buildPlane.dynamic.provider.aws.enabled }}
-          {{- if not .Values.pipelines.unifiedSecretInstallation }}
+          {{- if or (not .Values.pipelines.unifiedSecretInstallation) .Values.buildPlane.dynamic.provider.aws.existingSecret }}
           - name: buildplane-creds-aws
           {{- else }}
           - name: {{ include "pipelines.unifiedCustomSecretVolumeName" . }}
@@ -357,7 +357,7 @@ spec:
             readOnly: true
           {{- end }}
           {{- if .Values.buildPlane.dynamic.provider.k8s.enabled }}
-          {{- if not .Values.pipelines.unifiedSecretInstallation }}
+          {{- if or (not .Values.pipelines.unifiedSecretInstallation) .Values.buildPlane.dynamic.provider.k8s.existingSecret }}
           - name: buildplane-creds-k8s
           {{- else }}
           - name: {{ include "pipelines.unifiedCustomSecretVolumeName" . }}
@@ -434,7 +434,7 @@ spec:
               {{- if or .Values.pipelines.joinKeySecretName .Values.global.joinKeySecretName }}
               valueFrom:
                 secretKeyRef:
-                {{- if not .Values.pipelines.unifiedSecretInstallation }}
+                {{- if or (not .Values.pipelines.unifiedSecretInstallation) .Values.pipelines.joinKeySecretName .Values.global.joinKeySecretName }}
                   name: "{{ include "pipelines.joinKeySecretName" . }}"
                 {{- else }}
                   name: "{{ template "pipelines.name" . }}-unified-secret"
@@ -492,7 +492,7 @@ spec:
             - name: JF_SHARED_SECURITY_MASTERKEY
               valueFrom:
                 secretKeyRef:
-                {{- if not .Values.pipelines.unifiedSecretInstallation }}
+                {{- if or (not .Values.pipelines.unifiedSecretInstallation) .Values.pipelines.masterKeySecretName .Values.global.masterKeySecretName }}
                   name: "{{ include "pipelines.masterKeySecretName" . }}"
                 {{- else }}
                   name: "{{ template "pipelines.name" . }}-unified-secret"
@@ -501,7 +501,7 @@ spec:
             - name: JF_SHARED_SECURITY_JOINKEY
               valueFrom:
                 secretKeyRef:
-                {{- if not .Values.pipelines.unifiedSecretInstallation }}
+                {{- if or (not .Values.pipelines.unifiedSecretInstallation) .Values.pipelines.joinKeySecretName .Values.global.joinKeySecretName }}
                   name: "{{ include "pipelines.joinKeySecretName" . }}"
                 {{- else }}
                   name: "{{ template "pipelines.name" . }}-unified-secret"

diff --git a/stable/pipelines/templates/pipelines-statefulset.yaml b/stable/pipelines/templates/pipelines-statefulset.yaml
@@ -91,7 +91,7 @@ spec:
           - name: jfrog-pipelines-folder
             mountPath: {{ .Values.pipelines.mountPath }}
         {{- if or .Values.systemYamlOverride.existingSecret .Values.pipelines.systemYaml }}
-          {{- if not .Values.pipelines.unifiedSecretInstallation }}
+          {{- if or (not .Values.pipelines.unifiedSecretInstallation) .Values.systemYamlOverride.existingSecret }}
           - name: systemyaml
           {{- else }}
           - name: {{ include "pipelines.unifiedCustomSecretVolumeName" . }}
@@ -203,7 +203,7 @@ spec:
           - name: jfrog-pipelines-folder
             mountPath: {{ .Values.pipelines.mountPath }}
         {{- if or .Values.systemYamlOverride.existingSecret .Values.pipelines.systemYaml }}
-          {{- if not .Values.pipelines.unifiedSecretInstallation }}
+          {{- if or (not .Values.pipelines.unifiedSecretInstallation) .Values.systemYamlOverride.existingSecret }}
           - name: systemyaml
           {{- else }}
           - name: {{ include "pipelines.unifiedCustomSecretVolumeName" . }}
@@ -334,7 +334,7 @@ spec:
             - name: PIPELINES_MASTER_KEY
               valueFrom:
                 secretKeyRef:
-                {{- if not .Values.pipelines.unifiedSecretInstallation }}
+                {{- if or (not .Values.pipelines.unifiedSecretInstallation) .Values.pipelines.masterKeySecretName .Values.global.masterKeySecretName }}
                   name: "{{ include "pipelines.masterKeySecretName" . }}"
                 {{- else }}
                   name: "{{ template "pipelines.name" . }}-unified-secret"
@@ -345,7 +345,7 @@ spec:
             - name: PIPELINES_JOIN_KEY
               valueFrom:
                 secretKeyRef:
-                {{- if not .Values.pipelines.unifiedSecretInstallation }}
+                {{- if or (not .Values.pipelines.unifiedSecretInstallation) .Values.pipelines.joinKeySecretName .Values.global.joinKeySecretName }}
                   name: "{{ include "pipelines.joinKeySecretName" . }}"
                 {{- else }}
                   name: "{{ template "pipelines.name" . }}-unified-secret"
@@ -482,7 +482,7 @@ spec:
               {{- if or .Values.pipelines.joinKeySecretName .Values.global.joinKeySecretName }}
               valueFrom:
                 secretKeyRef:
-                {{- if not .Values.pipelines.unifiedSecretInstallation }}
+                {{- if or (not .Values.pipelines.unifiedSecretInstallation) .Values.pipelines.joinKeySecretName .Values.global.joinKeySecretName }}
                   name: "{{ include "pipelines.joinKeySecretName" . }}"
                 {{- else }}
                   name: "{{ template "pipelines.name" . }}-unified-secret"
@@ -540,7 +540,7 @@ spec:
             - name: JF_SHARED_SECURITY_MASTERKEY
               valueFrom:
                 secretKeyRef:
-                {{- if not .Values.pipelines.unifiedSecretInstallation }}
+                {{- if or (not .Values.pipelines.unifiedSecretInstallation) .Values.pipelines.masterKeySecretName .Values.global.masterKeySecretName }}
                   name: "{{ include "pipelines.masterKeySecretName" . }}"
                 {{- else }}
                   name: "{{ template "pipelines.name" . }}-unified-secret"
@@ -549,7 +549,7 @@ spec:
             - name: JF_SHARED_SECURITY_JOINKEY
               valueFrom:
                 secretKeyRef:
-                {{- if not .Values.pipelines.unifiedSecretInstallation }}
+                {{- if or (not .Values.pipelines.unifiedSecretInstallation) .Values.pipelines.joinKeySecretName .Values.global.joinKeySecretName }}
                   name: "{{ include "pipelines.joinKeySecretName" . }}"
                 {{- else }}
                   name: "{{ template "pipelines.name" . }}-unified-secret"