fix redis env helper

bunkerity · Jan 27, 2025 · 3e90719 · 3e90719
1 parent 5487cc8
commit 3e90719
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 14 deletions.
diff --git a/charts/bunkerweb/templates/_helpers.tpl b/charts/bunkerweb/templates/_helpers.tpl
@@ -90,26 +90,34 @@ REDIS settings
 - name: REDIS_USERNAME
   value: ""
 - name: REDIS_PASSWORD
+    {{- if not (empty .Values.settings.existingSecret) }}
+  valueFrom:
+    secretKeyRef:
+      name: "{{ .Values.settings.existingSecret }}"
+      key: redis-password
+    {{- else }}
   value: "{{ .Values.redis.config.password }}"
+    {{- end }}
   {{- else }}
 - name: REDIS_HOST
   value: "{{ .Values.settings.redis.redisHost }}"
 - name: REDIS_USERNAME
-  {{- if not (empty .Values.settings.existingSecret) }}
+    {{- if not (empty .Values.settings.existingSecret) }}
   valueFrom:
     secretKeyRef:
       name: "{{ .Values.settings.existingSecret }}"
       key: redis-username
-  {{- else }}
+    {{- else }}
   value: "{{ .Values.settings.redis.redisUsername }}"
-  {{- end }}
+    {{- end }}
 - name: REDIS_PASSWORD
-  {{- if not (empty .Values.settings.existingSecret) }}
+    {{- if not (empty .Values.settings.existingSecret) }}
   valueFrom:
     secretKeyRef:
       name: "{{ .Values.settings.existingSecret }}"
       key: redis-password
-  {{- else }}
+    {{- else }}
   value: "{{ .Values.settings.redis.redisPassword }}"
+    {{- end }}
   {{- end }}
 {{- end }}
diff --git a/charts/bunkerweb/values.yaml b/charts/bunkerweb/values.yaml
@@ -8,15 +8,16 @@ nodeSelector: {}
 # Settings related to BW in a k8s environment
 settings:
   # Specify the name of an existing secret containing the values of certain sensitive parameters listed here with their corresponding keys :
-  # databaseUri : database-uri
-  # redisUsername : redis-username
-  # redisPassword : redis-password
-  # adminUsername : admin-username
-  # adminPassword : admin-password
-  # flaskSecret: flask-secret
-  # totpSecrets: totp-secrets
-  # mariadb.user : mariadb-user
-  # mariadb.password : mariadb-password
+  # settings.misc.databaseUri : database-uri
+  # settings.redis.redisUsername : redis-username
+  # settings.redis.redisPassword : redis-password
+  # settings.ui.adminUsername : admin-username
+  # settings.ui.adminPassword : admin-password
+  # settings.ui.flaskSecret: flask-secret
+  # settings.ui.totpSecrets: totp-secrets
+  # redis.config.password : redis-password
+  # mariadb.config.user : mariadb-user
+  # mariadb.config.password : mariadb-password
   existingSecret: ""
   kubernetes:
     namespaces: ""