fixing #80 invalid secret ref from loader job

boomerang-io · Jan 11, 2023 · c36f131 · c36f131
1 parent 24237c2
commit c36f131
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 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.0
+version: 4.14.1
 appVersion: 3.12.0
 home: https://useboomerang.io
 dependencies:

diff --git a/bmrg-flow/templates/hook-job-data.yaml b/bmrg-flow/templates/hook-job-data.yaml
@@ -31,13 +31,11 @@ spec:
           env:
           - 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 "-" "_" }} "
-          {{- if $.Values.global.database.mongodb.secretName }}
           - name: MONGODB_PASSWORD
             valueFrom:
               secretKeyRef:
-                name: {{ $.Values.global.database.mongodb.secretName }}
-                key: mongodb-password
-          {{- end }}
+                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 }}
           {{- if $.Values.global.database.mongodb.tlsSecretName }}
           volumeMounts:
           - name: cert-vol-mongodb

diff --git a/bmrg-flow/values.yaml b/bmrg-flow/values.yaml
@@ -103,13 +103,13 @@ services:
 global:
   database:
     mongodb:
-      host: bmrg-mdb001-ibm-mongodb-dev
+      host: mongodb
       port: 27017
       database: boomerang
       args:
       user: boomerang
       password: passw0rd
-      secretName:
+      secretName: mongodb
       tlsSecretName:
   ingress:
     enabled: false