DevOps/truecharts
2
0
Fork 0
Code Issues Pull Requests Actions 30 Packages Projects Releases 1 Wiki Activity

fix(common): correct mistakes in install and upgrade init containers

Browse Source
This commit is contained in:
kjeld Schouten-Lebbing
2022-01-23 18:13:58 +01:00
parent b48cea1e8c
commit 0496669de6
2 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/library/common/Chart.yaml
+1 -1
View File
@@ -15,4 +15,4 @@ maintainers:
name: common name: common
sources: null sources: null
type: library type: library
version: 8.14.0 version: 8.14.1
charts/library/common/templates/lib/controller/_pod.tpl
+26 -26
View File
@@ -52,6 +52,32 @@ terminationGracePeriodSeconds: {{ . }}
initContainers: initContainers:
{{- include "common.controller.autopermissions" . | nindent 2 }} {{- include "common.controller.autopermissions" . | nindent 2 }}
{{- include "common.dependencies.postgresql.init" . | nindent 2 }} {{- include "common.dependencies.postgresql.init" . | nindent 2 }}
{{- if .Release.IsInstall }}
{{- if .Values.installContainers }}
{{- $installContainers := list }}
{{- range $index, $key := (keys .Values.installContainers | uniq | sortAlpha) }}
{{- $container := get $.Values.installContainers $key }}
{{- if not $container.name -}}
{{- $_ := set $container "name" $key }}
{{- end }}
{{- $installContainers = append $installContainers $container }}
{{- end }}
{{- tpl (toYaml $installContainers) $ | nindent 2 }}
{{- end }}
{{- end }}
{{- if .Release.IsUpgrade }}
{{- if .Values.upgradeContainers }}
{{- $upgradeContainers := list }}
{{- range $index, $key := (keys .Values.upgradeContainers | uniq | sortAlpha) }}
{{- $container := get $.Values.upgradeContainers $key }}
{{- if not $container.name -}}
{{- $_ := set $container "name" $key }}
{{- end }}
{{- $upgradeContainers = append $upgradeContainers $container }}
{{- end }}
{{- tpl (toYaml $upgradeContainers) $ | nindent 2 }}
{{- end }}
{{- end }}
{{- if .Values.initContainers }} {{- if .Values.initContainers }}
{{- $initContainers := list }} {{- $initContainers := list }}
{{- range $index, $key := (keys .Values.initContainers | uniq | sortAlpha) }} {{- range $index, $key := (keys .Values.initContainers | uniq | sortAlpha) }}
@@ -63,32 +89,6 @@ initContainers:
{{- end }} {{- end }}
{{- tpl (toYaml $initContainers) $ | nindent 2 }} {{- tpl (toYaml $initContainers) $ | nindent 2 }}
{{- end }} {{- end }}
{{- if .Release.IsInstall }}
{{- if .Values.installContainers }}
{{- $initContainers := list }}
{{- range $index, $key := (keys .Values.initContainers | uniq | sortAlpha) }}
{{- $container := get $.Values.initContainers $key }}
{{- if not $container.name -}}
{{- $_ := set $container "name" $key }}
{{- end }}
{{- $initContainers = append $initContainers $container }}
{{- end }}
{{- tpl (toYaml $initContainers) $ | nindent 2 }}
{{- end }}
{{- end }}
{{- if .Release.IsUpgrade }}
{{- if .Values.upgradeContainers }}
{{- $initContainers := list }}
{{- range $index, $key := (keys .Values.initContainers | uniq | sortAlpha) }}
{{- $container := get $.Values.initContainers $key }}
{{- if not $container.name -}}
{{- $_ := set $container "name" $key }}
{{- end }}
{{- $initContainers = append $initContainers $container }}
{{- end }}
{{- tpl (toYaml $initContainers) $ | nindent 2 }}
{{- end }}
{{- end }}
containers: containers:
{{- include "common.controller.mainContainer" . | nindent 2 }} {{- include "common.controller.mainContainer" . | nindent 2 }}
{{- with .Values.additionalContainers }} {{- with .Values.additionalContainers }}