add existingSecret option, align postgres PW handling

This commit is contained in:
c4tz 2022-11-16 15:22:32 +01:00
parent 9960f52561
commit 2fc2751d75
4 changed files with 16 additions and 2 deletions

View file

@ -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 }}

View file

@ -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 }}

View file

@ -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 }}

View file

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