diff --git a/library/common/1.0.0/templates/lib/pod/_initContainers.tpl b/library/common/1.0.0/templates/lib/pod/_initContainers.tpl index 521fd3e651..52be2b9d97 100644 --- a/library/common/1.0.0/templates/lib/pod/_initContainers.tpl +++ b/library/common/1.0.0/templates/lib/pod/_initContainers.tpl @@ -1,8 +1,9 @@ {{- define "ix.v1.common.controller.initContainers" -}} {{- $initContainers := .initContainers -}} + {{- $type := .type -}} {{- $root := .root -}} - {{- range $name, $container := $initContainers }} + {{- range $name, $container := $initContainers }} {{/* TODO: not only init. any type of containers */}} {{- if $container.name -}} {{- $name = $container.name -}} {{- end -}} @@ -31,10 +32,12 @@ envFrom: {{- . | nindent 4 }} {{- end -}} + {{- if ne $type "init" -}} {{/* Init containers do not have lifecycle... */}} {{- with (include "ix.v1.common.container.lifecycle" (dict "lifecycle" $container.lifecycle "root" $root)) | trim }} lifecycle: {{- . | nindent 4 }} {{- end -}} + {{- end -}} {{- with (include "ix.v1.common.container.securityContext" (dict "secCont" $container.securityContext "podSecCont" $container.podSecurityContext "root" $root)) | trim }} securityContext: {{- . | nindent 4 }} diff --git a/library/common/1.0.0/templates/lib/pod/_pod.tpl b/library/common/1.0.0/templates/lib/pod/_pod.tpl index 335761033b..5752659c41 100644 --- a/library/common/1.0.0/templates/lib/pod/_pod.tpl +++ b/library/common/1.0.0/templates/lib/pod/_pod.tpl @@ -54,7 +54,7 @@ runtimeClassName: {{ . }} containers: {{- . | nindent 2 }} {{- end -}}{{/*TODO: init/install/upgradeContainers */}} -{{- with (include "ix.v1.common.controller.initContainers" (dict "root" . "initContainers" .Values.initContainers) | trim) }} +{{- with (include "ix.v1.common.controller.initContainers" (dict "root" . "initContainers" .Values.initContainers "type" "init") | trim) }} initContainers: {{- . | nindent 2 }} {{- end -}}