Add a databaseSecrets value to populate the DATABASE variables (#186)

* Add databaseSecrets * Fix unwanted .unleash. * fix databasesecrets default as an array * update chart version to 5.4.1 * fixed spelling mistate in values file * Remove trailing whitespace --------- Co-authored-by: sshort <steve.short@fortra.com>
Unleash · Feb 21, 2025 · f9e9a4f · f9e9a4f
1 parent 6b5cf97
commit f9e9a4f
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 1 deletion.
diff --git a/charts/unleash/Chart.yaml b/charts/unleash/Chart.yaml
@@ -5,7 +5,7 @@ icon: https://docs.getunleash.io/img/logo.svg
 
 type: application
 
-version: 5.4.0
+version: 5.4.1
 
 appVersion: "6.6.0"
 

diff --git a/charts/unleash/templates/deployment.yaml b/charts/unleash/templates/deployment.yaml
@@ -47,6 +47,15 @@ spec:
             {{- end }}
             - name: DATABASE_NAME
               value: "{{ .Values.dbConfig.database }}"
+            {{ if .Values.databaseSecrets}}
+            {{- range .Values.databaseSecrets }}
+            - name: {{ .name }}
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .valueFrom.secretKeyRef.name }}
+                  key: {{ .valueFrom.secretKeyRef.key }}
+            {{- end }}
+            {{- else }}
             - name: DATABASE_HOST
               value: "{{ if .Values.postgresql.enabled }}{{ .Values.postgresql.fullnameOverride }}{{ else }}{{ .Values.dbConfig.host }}{{ end }}"
             - name: DATABASE_PASSWORD
@@ -55,6 +64,7 @@ spec:
               value: "{{ .Values.dbConfig.port }}"
             - name: DATABASE_USERNAME
               value: "{{ .Values.dbConfig.user }}"
+            {{- end }}
             {{- if .Values.dbConfig.ssl }}
             - name: DATABASE_SSL
               value: {{ .Values.dbConfig.ssl | toJson | quote }}

diff --git a/charts/unleash/values.yaml b/charts/unleash/values.yaml
@@ -61,6 +61,30 @@ dbConfig:
   # sslRejectUnauthorized can be set to true|false. Don't set this to false in production, it will void any security you get from using SSL to connect
   # sslRejectUnauthorized
 
+# adds DATABASE_ host, port, username and password environment vars from a secrets file for use with Crossplane RDSInstance
+databaseSecrets:
+  []
+    # - name: DATABASE_HOST
+    #   valueFrom:
+    #     secretKeyRef:
+    #       name:  db-conn
+    #       key: endpoint
+    # - name: DATABASE_PORT
+    #   valueFrom:
+    #     secretKeyRef:
+    #       name:  db-conn
+    #       key: port
+    # - name: DATABASE_USERNAME
+    #   valueFrom:
+    #     secretKeyRef:
+    #       name:  db-conn
+    #       key: username
+    # - name: DATABASE_PASSWORD
+    #   valueFrom:
+    #     secretKeyRef:
+    #       name:  db-conn
+    #       key: password
+
 env: []
 #  - name: GOOGLE_CLIENT_ID
 #    value: 999999999999-999z99zz9zzzzzz99z9zz9z9zzzzzz9z.apps.googleusercontent.com