fix(helm): put password into file

Signed-off-by: WoodenMaiden <yann.pomie@laposte.net>
SouthGreenPlatform · Aug 30, 2024 · 1c673d3 · 1c673d3
1 parent edf34a0
commit 1c673d3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/agrold-javaweb/charts/virtuoso/templates/secrets.yaml b/agrold-javaweb/charts/virtuoso/templates/secrets.yaml
@@ -5,6 +5,6 @@ metadata:
   name: {{ include "sparql.secretName" . }}
 type: Opaque
 data:
-  DAVPassword: {{ .Values.DAVPassword | default (randAlphaNum 32) | b64enc | quote }}
-  DBAPassword: {{ .Values.DBAPassword | default (randAlphaNum 32) | b64enc | quote }}
+  dav_password: {{ .Values.DAVPassword | default (randAlphaNum 32) | b64enc | quote }}
+  dba_password: {{ .Values.DBAPassword | default (randAlphaNum 32) | b64enc | quote }}
 
diff --git a/agrold-javaweb/charts/virtuoso/templates/statefulset.yaml b/agrold-javaweb/charts/virtuoso/templates/statefulset.yaml
@@ -1,3 +1,4 @@
+{{- $mount_initdb := or .Values.initdb.enabled .Values.facetedSearch.enabled (not .Values.serveConductor) -}}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
@@ -32,13 +33,15 @@ spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       volumes:
-        {{- $mount_initdb := or .Values.initdb.enabled .Values.facetedSearch.enabled (not .Values.serveConductor) -}}
         {{- if $mount_initdb }}
         - name: {{ include "sparql.initdb.configMapName" . }}
           configMap:
             defaultMode: 0551
             name: {{ include "sparql.initdb.configMapName" . }}
         {{- end }}
+        - name: {{ include "sparql.secretName" . }}
+          secret:
+            secretName: {{ include "sparql.secretName" . }}
       containers:
         - name: {{ .Chart.Name }}
           securityContext:
@@ -67,21 +70,18 @@ spec:
             - name: {{ .Values.persistence.name }}-pvc
               mountPath: /database
             {{- end }}
+            - name: {{ include "sparql.secretName" . }}
+              mountPath: /settings
+              readOnly: true
           env:
+            - name: DBA_PASSWORD_FILE
+              value: /settings/dba_password
+            - name: DAV_PASSWORD_FILE
+              value: /settings/dav_password
             {{- range $key, $value := .Values.env }}
             - name: {{ $key | quote }}
               value: {{ $value | quote }}
             {{- end }}
-            - name: "DAV_PASSWORD"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ include "sparql.secretName" . }}
-                  key: DAVPassword
-            - name: "DBA_PASSWORD"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ include "sparql.secretName" . }}
-                  key: DBAPassword
             {{- if .Values.iniFileValues.enabled -}}
             {{- range $section, $entry := .Values.iniFileValues.values }}
               {{- range $key, $_ := $entry }}