Support loading extra envFrom, fix mongodb password loading when not using existingSecret

Author: SIMULATAN

backend/Chart.lock

@@ -1,12 +1,12 @@
 dependencies:
 - name: common
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 2.22.0
+  version: 2.24.0
 - name: mongodb
   repository: https://charts.bitnami.com/bitnami
-  version: 15.6.22
+  version: 15.6.26
 - name: keycloak
   repository: https://charts.bitnami.com/bitnami
   version: 22.1.2
-digest: sha256:d12da76a8e37e2c842d48c0243765f275070a3b7d4876637280594aaa8d3035c
-generated: "2024-09-07T22:00:15.851075091+02:00"
+digest: sha256:f0924715b75e38bc52785086e8299760d329c171031ab74ef567b6f9d0b92c05
+generated: "2024-10-06T14:20:14.977091901+02:00"

backend/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: backend
-version: 0.2.0
+version: 0.2.1
 description: Backend of the Snoty application suite
 type: application
 home: https://snoty.me
@@ -12,7 +12,7 @@ maintainers:
     email: [email protected]
     url: https://github.com/SIMULATAN
 icon: https://avatars.githubusercontent.com/u/163506575
-appVersion: "0.0.1-133"
+appVersion: "0.0.1-176"
 dependencies:
   - name: common
     version: 2.x.x

backend/charts/common-2.22.0.tgz

@@ -76,44 +76,33 @@
 {{- end }}
 
 {{- define "snoty.envLoaders" -}}
-{{- with $.Values.appConfig }}
-  {{ if kindIs "map" .database }}
-  {{- with .database }}
-  {{ if kindIs "map" .password }}
-  {{- with .password -}}
-  - name: database.password
+  {{ if kindIs "map" .Values.mongodb.auth }}
+  {{- with .Values.mongodb.auth }}
+  {{ if .existingSecret }}
+  - name: mongodb.authentication.password
     valueFrom:
       secretKeyRef:
-        name: {{ .secretName }}
-        key: {{ .secretKey | default "password" }}
+        name: {{ .existingSecret }}
+        key: {{ .secretKey | default "mongodb-passwords" }}
   {{- end -}}
   {{- end -}}
-  {{ if kindIs "map" .jdbcUrl }}
-  {{- with .jdbcUrl -}}
-  - name: database.jdbcUrl
-    valueFrom:
-      secretKeyRef:
-        name: {{ .secretName }}
-        key: {{ .secretKey | default "jdbcUrl" }}
-  {{- end -}}
-  {{- end -}}
-  {{- end -}}
-  {{- end -}}
-  {{- with .authentication -}}
-  {{ if kindIs "map" .clientId }}
-  - name: authentication.clientId
-    valueFrom:
-      secretKeyRef:
-        name: {{ .clientId.secretName }}
-        key: {{ .clientId.secretKey | default "clientId" }}
-  {{- end -}}
-  {{ if kindIs "map" .clientSecret }}
-  - name: authentication.clientSecret
-    valueFrom:
-      secretKeyRef:
-        name: {{ .clientSecret.secretName }}
-        key: {{ .clientSecret.secretKey | default "clientSecret" }}
   {{- end -}}
+  {{- with $.Values.appConfig }}
+    {{- with .authentication -}}
+    {{ if kindIs "map" .clientId }}
+    - name: authentication.clientId
+      valueFrom:
+        secretKeyRef:
+          name: {{ .clientId.secretName }}
+          key: {{ .clientId.secretKey | default "clientId" }}
+    {{- end -}}
+    {{ if kindIs "map" .clientSecret }}
+    - name: authentication.clientSecret
+      valueFrom:
+        secretKeyRef:
+          name: {{ .clientSecret.secretName }}
+          key: {{ .clientSecret.secretKey | default "clientSecret" }}
+    {{- end -}}
+    {{- end -}}
   {{- end -}}
 {{- end -}}
-{{- end -}}

backend/charts/common-2.24.0.tgz

@@ -35,18 +35,15 @@ spec:
           {{- include "common.tplvalues.render" (dict "value" .Values.extraContainerPorts "context" $) | nindent 12 }}
           {{- end }}
         env:
-          - name: mongodb.authentication.password
-            valueFrom:
-              secretKeyRef:
-                name: {{ .Values.mongodb.auth.existingSecret }}
-                key: mongodb-passwords
           {{- $envLoaders := include "snoty.envLoaders" . | nindent 8 | trim }}
           {{- if $envLoaders }}
           {{ $envLoaders }}
           {{- end }}
           {{- if .Values.extraEnvVars }}
           {{- include "common.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 10 }}
           {{- end }}
+        envFrom:
+          {{- .Values.extraEnvFrom | toYaml | nindent 10 }}
         volumeMounts:
           - mountPath: /app/application.yml
             name: app-config