Updated to take in a dynamic secretKey for database

boomerang-io · Jan 11, 2023 · 7388a85 · 7388a85
1 parent c36f131
commit 7388a85
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/bmrg-flow/Chart.yaml b/bmrg-flow/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: bmrg-flow
 description: Boomerang Flow
 type: application
-version: 4.14.1
+version: 4.14.2
 appVersion: 3.12.0
 home: https://useboomerang.io
 dependencies:
@@ -19,5 +19,4 @@ keywords:
   - boomerang
   - flow
   - workflows
-  - tekton-pipelines
   - oauth2-proxy
diff --git a/bmrg-flow/templates/deployment-service.yaml b/bmrg-flow/templates/deployment-service.yaml
@@ -55,7 +55,7 @@ spec:
             valueFrom:
               secretKeyRef:
                 name: {{ if $.Values.global.database.mongodb.secretName }}{{ $.Values.global.database.mongodb.secretName }}{{ else }}{{ include "bmrg.name" (dict "context" $context "tier" "secrets" ) }}{{ end }}
-                key: {{ if $.Values.global.database.mongodb.secretName }}mongodb-password{{ else }}MONGODB_PASSWORD{{ end }}
+                key: {{ if $.Values.global.database.mongodb.secretName }}{{ $.Values.global.database.mongodb.secretKey }}{{ else }}MONGODB_PASSWORD{{ end }}
           {{- if and (eq $k "workflow") }}
           - name: FLOW_OTC
             valueFrom:

diff --git a/bmrg-flow/templates/hook-job-data.yaml b/bmrg-flow/templates/hook-job-data.yaml
@@ -32,10 +32,14 @@ spec:
           - name: JAVA_OPTS
             value: "-Dspring.profiles.active={{ $values.job.data.profile }} -Dspring.data.mongodb.uri=mongodb://{{ $.Values.global.database.mongodb.user }}:${MONGODB_PASSWORD}@{{ $.Values.global.database.mongodb.host }}{{ if $.Values.global.database.mongodb.port }}:{{ $.Values.global.database.mongodb.port }}{{ end }}/{{ $.Values.global.database.mongodb.database }}{{ if $.Values.global.database.mongodb.args }}?{{ $.Values.global.database.mongodb.args }}{{ end }} -Dflow.mongo.collection.prefix={{ default "bmrg-flow" $.Values.general.namePrefix | trimPrefix "bmrg-" | replace "-" "_" }} "
           - name: MONGODB_PASSWORD
+          {{- if $.Values.global.database.mongodb.secretName }}
             valueFrom:
               secretKeyRef:
-                name: {{ if $.Values.global.database.mongodb.secretName }}{{ $.Values.global.database.mongodb.secretName }}{{ else }}{{ include "bmrg.name" (dict "context" $context "tier" "secrets" ) }}{{ end }}
-                key: {{ if $.Values.global.database.mongodb.secretName }}mongodb-password{{ else }}MONGODB_PASSWORD{{ end }}
+                name: {{ $.Values.global.database.mongodb.secretName }}
+                key: {{ $.Values.global.database.mongodb.secretKey }}
+          {{- else }}
+            value: {{ $.Values.global.database.mongodb.password }}
+          {{- end }}
           {{- if $.Values.global.database.mongodb.tlsSecretName }}
           volumeMounts:
           - name: cert-vol-mongodb

diff --git a/bmrg-flow/values.yaml b/bmrg-flow/values.yaml
@@ -110,6 +110,7 @@ global:
       user: boomerang
       password: passw0rd
       secretName: mongodb
+      secretKey: mongodb-passwords
       tlsSecretName:
   ingress:
     enabled: false