Merge branch 'master' into 'master'

Add existingSecret option, align postgres PW handling

See merge request burke-software/django-helm-chart!6

templates/beat/deployment.yaml

@@ -47,12 +47,16 @@ spec:
             - name: DATABASE_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: {{ include "django.postgresql.fullname" . }}
+                  name: {{ default (include "django.postgresql.fullname" .) .Values.postgresql.auth.existingSecret }}
                   key: postgres-password
 {{- end }}
           envFrom:
             - secretRef:
                 name: {{ include "django.fullname" . }}
+            {{- if .Values.existingSecret }}
+            - secretRef:
+                name: {{ .Values.existingSecret }}
+            {{- end }}
             - configMapRef:
                 name: {{ include "django.fullname" . }}
       {{- with .Values.beat.nodeSelector }}

templates/web/deployment.yaml

@@ -74,6 +74,10 @@ spec:
           envFrom:
             - secretRef:
                 name: {{ include "django.fullname" . }}
+            {{- if .Values.existingSecret }}
+            - secretRef:
+                name: {{ .Values.existingSecret }}
+            {{- end }}
             - configMapRef:
                 name: {{ include "django.fullname" . }}
       {{- with .Values.web.nodeSelector }}

templates/worker/deployment.yaml

@@ -46,12 +46,16 @@ spec:
             - name: DATABASE_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: {{ include "django.postgresql.fullname" . }}
+                  name: {{ default (include "django.postgresql.fullname" .) .Values.postgresql.auth.existingSecret }}
                   key: postgres-password
 {{- end }}
           envFrom:
             - secretRef:
                 name: {{ include "django.fullname" . }}
+            {{- if .Values.existingSecret }}
+            - secretRef:
+                name: {{ .Values.existingSecret }}
+            {{- end }}
             - configMapRef:
                 name: {{ include "django.fullname" . }}
       {{- with .Values.worker.nodeSelector }}

values.yaml

@@ -18,6 +18,8 @@ env:
     # DATABASE_URL:
     # REDIS_URL:
 
+existingSecret: ""
+
 web:
   replicaCount: 2
   port: 8080