Merge pull request #75 from vicsufer/main

Use environment variables from secret on database job.
firefly-iii · Dec 12, 2024 · 8ba7514 · 8ba7514
2 parents 866e742 + 5b3e9f1
commit 8ba7514
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/charts/firefly-db/Chart.yaml b/charts/firefly-db/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: firefly-db
-version: 0.2.2
+version: 0.2.3
 description: Installs a postgres db for Firefly III
 type: application
 sources:

diff --git a/charts/firefly-db/templates/backup.tpl b/charts/firefly-db/templates/backup.tpl
@@ -5,8 +5,13 @@ spec:
     image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
     imagePullPolicy: IfNotPresent
     envFrom:
+    {{- if not .Values.configs.existingSecret }}
     - configMapRef:
         name: {{ template "firefly-db.fullname" . }}-config
+    {{- else }}
+    - secretRef:
+        name: {{ .Values.configs.existingSecret }}
+    {{- end }}
     command:
     - /bin/sh
     - -c

diff --git a/charts/firefly-db/templates/firefly-db-cm.yml b/charts/firefly-db/templates/firefly-db-cm.yml
@@ -1,3 +1,4 @@
+{{- if not .Values.configs.existingSecret }}  
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -11,4 +12,5 @@ metadata:
 data:
 {{- range $key, $value := .Values.configs }}
   {{ $key }}: {{ $value | quote }}
-{{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/firefly-db/templates/firefly-db-restore-job.yml b/charts/firefly-db/templates/firefly-db-restore-job.yml
@@ -23,8 +23,13 @@ spec:
         image: alpine:3.13
         imagePullPolicy: IfNotPresent
         envFrom:
+        {{- if not .Values.configs.existingSecret }}
         - configMapRef:
             name: {{ template "firefly-db.fullname" . }}-config
+        {{- else }}
+        - secretRef:
+            name: {{ .Values.configs.existingSecret }}
+        {{- end }}
         command: 
         - /bin/sh
         - -c

diff --git a/charts/firefly-db/values.yaml b/charts/firefly-db/values.yaml
@@ -9,7 +9,7 @@ storage:
   dataSize: 1Gi
   # -- Use an existing PersistentVolumeClaim, overrides values above
   existingClaim: ""
-  
+
 backup:
   # There are two possible backup destinations currently implemented, http and pvc
   destination: http