Extracted the image namespace

Signed-off-by: Mark Hender <mhender@pivotal.io>
Co-authored-by: Mark Hender <mhender@pivotal.io>
pull/7332/head
Konstantin Semenov 6 years ago committed by Mark Hender
parent f1b0fae172
commit 6821bf52f4

@ -255,7 +255,7 @@ spec:
{{- toYaml .Values.podSecurityContext | nindent 8 }} {{- toYaml .Values.podSecurityContext | nindent 8 }}
containers: containers:
- name: {{ .Chart.Name }} - name: {{ .Chart.Name }}
{{ include "<CHARTNAME>.registryImage" (dict "image" .Values.images.nginx "global" .Values.global) | indent 10 }} {{ include "<CHARTNAME>.registryImage" (dict "image" .Values.images.nginx "values" .Values) | indent 10 }}
securityContext: securityContext:
{{- toYaml .Values.securityContext | nindent 12 }} {{- toYaml .Values.securityContext | nindent 12 }}
ports: ports:
@ -414,8 +414,9 @@ The most complete image reference, including the
registry address, repository, tag and digest when available. registry address, repository, tag and digest when available.
*/}} */}}
{{- define "<CHARTNAME>.imageReference" -}} {{- define "<CHARTNAME>.imageReference" -}}
{{ $registry := coalesce .image.registry .global.imageRegistry "docker.io" }} {{- $registry := coalesce .image.registry .values.global.imageRegistry "docker.io" -}}
{{- printf "%s/%s:%s" $registry .image.name .image.tag -}} {{- $namespace := coalesce .image.namespace .values.imageNamespace .values.global.imageNamespace "library" -}}
{{- printf "%s/%s/%s:%s" $registry $namespace .image.name .image.tag -}}
{{- if .image.digest -}} {{- if .image.digest -}}
{{- printf "@%s" .image.digest -}} {{- printf "@%s" .image.digest -}}
{{- end -}} {{- end -}}
@ -425,7 +426,7 @@ registry address, repository, tag and digest when available.
Specify the image pull policy Specify the image pull policy
*/}} */}}
{{- define "<CHARTNAME>.imagePullPolicy" -}} {{- define "<CHARTNAME>.imagePullPolicy" -}}
{{ $policy := coalesce .image.pullPolicy .global.imagePullPolicy }} {{ $policy := coalesce .image.pullPolicy .values.global.imagePullPolicy }}
{{- if $policy -}} {{- if $policy -}}
imagePullPolicy: "{{ printf "%s" $policy -}}" imagePullPolicy: "{{ printf "%s" $policy -}}"
{{- end -}} {{- end -}}

Loading…
Cancel
Save