fix server password recreation issue

Author: Lur1an

charts/edgedb/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 name: edgedb
 description: A Helm chart for self hosting EdgeDB
 type: application
-version: 0.1.2
+version: 0.1.3
 appVersion: "5.6"

charts/edgedb/templates/_helpers.tpl

@@ -52,13 +52,14 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 
 
 {{/*
-Get the server password value
+Generate or lookup password
 */}}
-{{- define "edgedb.serverPassword" -}}
-{{- if .Values.security.password }}
-{{- .Values.security.password.secret.name }}
+{{- define "edgedb.password" -}}
+{{- $secret := lookup "v1" "Secret" .Release.Namespace (printf "%s-server-password" (include "edgedb.fullname" .)) }}
+{{- if $secret }}
+{{- index $secret.data "password" | b64dec }}
 {{- else }}
-{{- include "edgedb.fullname" . }}-server-password
+{{- randAlphaNum 20 }}
 {{- end }}
 {{- end }}
 

charts/edgedb/templates/deployment.yaml

@@ -89,13 +89,8 @@ spec:
         - name: EDGEDB_SERVER_PASSWORD
           valueFrom:
             secretKeyRef:
-            {{- if .Values.security.password }}
-              name: {{ .Values.security.password.secret.name }}
-              key: {{ .Values.security.password.secret.key }}
-            {{- else }}
               name: {{ include "edgedb.fullname" . }}-server-password
               key: password
-            {{- end}}
         {{- with .Values.env }}
         {{- toYaml . | nindent 8 }}
         {{- end }}

charts/edgedb/templates/password.yaml

@@ -11,6 +11,6 @@ metadata:
     {{- include "edgedb.labels" . | nindent 4 }}
 type: Opaque
 data:
-  password: {{ $password := randAlphaNum 20 }}{{ $password | b64enc | quote }}
+  password: {{ $password := include "edgedb.password" . }}{{ $password | b64enc | quote }}
   edgedbBackendDsn: {{ printf "edgedb://edgedb:%s@%s.%s.svc.cluster.local:5656" $password (include "edgedb.fullname" .) .Release.Namespace | b64enc | quote }}
 {{- end }}

charts/edgedb/templates/pvc.yaml

@@ -1,4 +1,7 @@
 {{- if .Values.storage.enabled }}
+{{- if not .Values.storage.className }}
+{{- fail "You must provide a storage class name" }}
+{{- end }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:

charts/edgedb/values-example.yaml

@@ -15,5 +15,5 @@ env:
   value: enabled
 storage:
   enabled: true
-  className: ""
+  className: "local-path"
   storage: "10Gi"