--- charts-original/templates/_helpers.tpl +++ charts/templates/_helpers.tpl @@ -69,11 +69,11 @@ {{/* Get specific image */}} -{{- define "ingress-nginx.image" -}} +{{- define "ingress-nginx.repository" -}} {{- if .chroot -}} -{{- printf "%s-chroot" .image -}} +{{- printf "%s-chroot" .repository -}} {{- else -}} -{{- printf "%s" .image -}} +{{- printf "%s" .repository -}} {{- end }} {{- end -}} @@ -259,3 +259,15 @@ - name: modules mountPath: /modules_mount {{- end -}} + +{{- define "system_default_registry" -}} +{{- if .Values.global.systemDefaultRegistry -}} +{{- printf "%s/" .Values.global.systemDefaultRegistry -}} +{{- else -}} +{{- "" -}} +{{- end -}} +{{- end -}} + +{{- define "repository_or_registry_and_image" -}} +{{- if .repository -}}{{ .repository }}{{ else }}{{ .registry }}/{{ .image }}{{- end -}}:{{ .tag }}{{- if (.digest) -}} @{{.digest}} {{- end -}} +{{- end -}}