More postgres fixes

This commit is contained in:
David Burke 2022-04-05 17:26:25 -04:00
parent 421fde816a
commit 95f1d26d94
4 changed files with 19 additions and 10 deletions

View file

@ -48,9 +48,12 @@ spec:
env: env:
- name: SERVER_ROLE - name: SERVER_ROLE
value: "beat" value: "beat"
{{- if .Values.env.secret.DATABASE_URL }} {{- if .Values.postgresql.enabled }}
- name: DATABASE_URL - name: DATABASE_PASSWORD
value: {{ .Values.env.secret.DATABASE_URL }} valueFrom:
secretKeyRef:
name: {{ include "django.postgresql.fullname" . }}
key: postgres-password
{{- end }} {{- end }}
envFrom: envFrom:
- secretRef: - secretRef:

View file

@ -64,9 +64,12 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: status.podIP fieldPath: status.podIP
{{- if .Values.env.secret.DATABASE_URL }} {{- if .Values.postgresql.enabled }}
- name: DATABASE_URL - name: DATABASE_PASSWORD
value: {{ .Values.env.secret.DATABASE_URL }} valueFrom:
secretKeyRef:
name: {{ include "django.postgresql.fullname" . }}
key: postgres-password
{{- end }} {{- end }}
envFrom: envFrom:
- secretRef: - secretRef:

View file

@ -1,7 +1,7 @@
{{- if or (and .Values.web.autoscaling.enabled (gt (.Values.web.autoscaling.minReplicas | int) 1)) (gt (.Values.web.replicaCount | int) 1) }} {{- if or (and .Values.web.autoscaling.enabled (gt (.Values.web.autoscaling.minReplicas | int) 1)) (gt (.Values.web.replicaCount | int) 1) }}
{{- if .Values.web.budget -}} {{- if .Values.web.budget -}}
{{- if .Values.web.budget.minAvailable -}} {{- if .Values.web.budget.minAvailable -}}
apiVersion: policy/v1beta1 apiVersion: policy/v1
kind: PodDisruptionBudget kind: PodDisruptionBudget
metadata: metadata:
name: {{ include "django.fullname" . }}-web name: {{ include "django.fullname" . }}-web

View file

@ -42,9 +42,12 @@ spec:
env: env:
- name: SERVER_ROLE - name: SERVER_ROLE
value: "worker" value: "worker"
{{- if .Values.env.secret.DATABASE_URL }} {{- if .Values.postgresql.enabled }}
- name: DATABASE_URL - name: DATABASE_PASSWORD
value: {{ .Values.env.secret.DATABASE_URL }} valueFrom:
secretKeyRef:
name: {{ include "django.postgresql.fullname" . }}
key: postgres-password
{{- end }} {{- end }}
envFrom: envFrom:
- secretRef: - secretRef: