redis password

wger-project · Jun 21, 2024 · 4ba372b · 4ba372b
1 parent 92f2e31
commit 4ba372b
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 14 deletions.
diff --git a/charts/wger/templates/_helpers.tpl b/charts/wger/templates/_helpers.tpl
@@ -135,12 +135,6 @@ environment:
     value: {{ .Values.celery.syncVideos | default "True" | quote }}
   - name: DOWNLOAD_INGREDIENTS_FROM
     value: {{ .Values.celery.ingredientsFrom | default "WGER" | quote }}
-  {{- if not .Values.redis.auth.enabled }}
-  - name: CELERY_BROKER
-    value: "redis://{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2"
-  - name: CELERY_BACKEND
-    value: "redis://{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2"
-  {{- end }}
   {{- end }}
 {{- end }}
 

diff --git a/charts/wger/templates/deployment.yaml b/charts/wger/templates/deployment.yaml
@@ -75,9 +75,14 @@ spec:
                   name: "redis"
                   key: "redis-password"
             - name: CELERY_BROKER
-              value: "redis://:$${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2"
+              value: "redis://:$(DJANGO_CACHE_CLIENT_PASSWORD)@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2"
             - name: CELERY_BACKEND
-              value: "redis://:$${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2"
+              value: "redis://:$(DJANGO_CACHE_CLIENT_PASSWORD)@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2"
+            {{- else }}
+            - name: CELERY_BROKER
+              value: "redis://{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2"
+            - name: CELERY_BACKEND
+              value: "redis://{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2"
             {{- end }}
             {{- if .Values.celery.flower.enabled }}
             - name: CELERY_FLOWER_PASSWORD
@@ -250,9 +255,14 @@ spec:
                   name: "redis"
                   key: "redis-password"
             - name: CELERY_BROKER
-              value: "redis://:$${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2"
+              value: "redis://:$(DJANGO_CACHE_CLIENT_PASSWORD)@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2"
+            - name: CELERY_BACKEND
+              value: "redis://:$(DJANGO_CACHE_CLIENT_PASSWORD)@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2"
+            {{- else }}
+            - name: CELERY_BROKER
+              value: "redis://{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2"
             - name: CELERY_BACKEND
-              value: "redis://:$${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2"
+              value: "redis://{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2"
             {{- end }}
             {{- if .Values.celery.flower.enabled }}
             - name: CELERY_FLOWER_PASSWORD
@@ -314,9 +324,14 @@ spec:
                   name: "redis"
                   key: "redis-password"
             - name: CELERY_BROKER
-              value: "redis://:$${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2"
+              value: "redis://:$(DJANGO_CACHE_CLIENT_PASSWORD)@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2"
             - name: CELERY_BACKEND
-              value: "redis://:$${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2"
+              value: "redis://:$(DJANGO_CACHE_CLIENT_PASSWORD)@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2"
+            {{- else }}
+            - name: CELERY_BROKER
+              value: "redis://{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2"
+            - name: CELERY_BACKEND
+              value: "redis://{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2"
             {{- end }}
             - name: CELERY_FLOWER_PASSWORD
               valueFrom:
@@ -439,9 +454,14 @@ spec:
                   name: "redis"
                   key: "redis-password"
             - name: CELERY_BROKER
-              value: "redis://:$${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2"
+              value: "redis://:$(DJANGO_CACHE_CLIENT_PASSWORD)@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2"
+            - name: CELERY_BACKEND
+              value: "redis://:$(DJANGO_CACHE_CLIENT_PASSWORD)@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2"
+            {{- else }}
+            - name: CELERY_BROKER
+              value: "redis://{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2"
             - name: CELERY_BACKEND
-              value: "redis://:$${DJANGO_CACHE_CLIENT_PASSWORD}@{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2"
+              value: "redis://{{ .Release.Name }}-redis:{{ int .Values.redis.service.serverPort }}/2"
             {{- end }}
             {{- if .Values.celery.flower.enabled }}
             - name: CELERY_FLOWER_PASSWORD