Add helper function for postgres name

This commit is contained in:
Waqar Ahmed
2020-12-14 19:41:16 +05:00
parent b30c99586f
commit 770b060bbc
4 changed files with 7 additions and 3 deletions
@@ -13,6 +13,10 @@ app.kubernetes.io/name: {{ include "nextcloud.name" . }}-postgres
app.kubernetes.io/instance: {{ .Release.Name }}-postgres app.kubernetes.io/instance: {{ .Release.Name }}-postgres
{{- end }} {{- end }}
{{- define "postgres.imageName" -}}
{{- print "postgres:13.1" -}}
{{- end -}}
{{/* {{/*
Retrieve postgres backup name Retrieve postgres backup name
This will return a unique name based on revision and chart numbers specified. This will return a unique name based on revision and chart numbers specified.
@@ -17,7 +17,7 @@ spec:
serviceAccountName: "{{ template "nextcloud.serviceAccountName" . }}" serviceAccountName: "{{ template "nextcloud.serviceAccountName" . }}"
containers: containers:
- name: {{ .Chart.Name }}-postgres-backup - name: {{ .Chart.Name }}-postgres-backup
image: "postgres:13.1" image: {{ template "postgres.imageName" . }}
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
env: env:
- name: POSTGRES_USER - name: POSTGRES_USER
@@ -38,7 +38,7 @@ spec:
{{- end }} {{- end }}
initContainers: initContainers:
- name: init-postgresdb - name: init-postgresdb
image: "postgres:13.1" image: {{ template "postgres.imageName" . }}
command: ['sh', '-c', "until pg_isready -h {{ template "nextcloud.fullname" . }}-postgres; do echo waiting for postgres; sleep 2; done"] command: ['sh', '-c', "until pg_isready -h {{ template "nextcloud.fullname" . }}-postgres; do echo waiting for postgres; sleep 2; done"]
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
containers: containers:
@@ -25,7 +25,7 @@ spec:
spec: spec:
containers: containers:
- name: {{ .Chart.Name }}-postgres - name: {{ .Chart.Name }}-postgres
image: "postgres:13.1" image: {{ template "postgres.imageName" . }}
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
env: env:
- name: POSTGRES_USER - name: POSTGRES_USER