diff --git a/charts/ingress-nginx/ci/daemonset-extra-modules.yaml b/charts/ingress-nginx/ci/daemonset-extra-modules.yaml index 2c3aba281..52a32fcbd 100644 --- a/charts/ingress-nginx/ci/daemonset-extra-modules.yaml +++ b/charts/ingress-nginx/ci/daemonset-extra-modules.yaml @@ -8,4 +8,6 @@ controller: extraModules: - name: opentelemetry image: + registry: registry.k8s.io image: busybox + tag: latest diff --git a/charts/ingress-nginx/ci/deployment-extra-modules-default-container-sec-context.yaml b/charts/ingress-nginx/ci/deployment-extra-modules-default-container-sec-context.yaml index e95396f87..91b1b98a8 100644 --- a/charts/ingress-nginx/ci/deployment-extra-modules-default-container-sec-context.yaml +++ b/charts/ingress-nginx/ci/deployment-extra-modules-default-container-sec-context.yaml @@ -10,4 +10,6 @@ controller: extraModules: - name: opentelemetry image: + registry: registry.k8s.io image: busybox + tag: latest diff --git a/charts/ingress-nginx/ci/deployment-extra-modules-specific-container-sec-context.yaml b/charts/ingress-nginx/ci/deployment-extra-modules-specific-container-sec-context.yaml index b961d4dd0..b6013c7d0 100644 --- a/charts/ingress-nginx/ci/deployment-extra-modules-specific-container-sec-context.yaml +++ b/charts/ingress-nginx/ci/deployment-extra-modules-specific-container-sec-context.yaml @@ -8,6 +8,8 @@ controller: extraModules: - name: opentelemetry image: + registry: registry.k8s.io image: busybox + tag: latest containerSecurityContext: allowPrivilegeEscalation: false diff --git a/charts/ingress-nginx/ci/deployment-extra-modules.yaml b/charts/ingress-nginx/ci/deployment-extra-modules.yaml index 69b5a1111..2fbe1cc01 100644 --- a/charts/ingress-nginx/ci/deployment-extra-modules.yaml +++ b/charts/ingress-nginx/ci/deployment-extra-modules.yaml @@ -8,4 +8,6 @@ controller: extraModules: - name: opentelemetry image: + registry: registry.k8s.io image: busybox + tag: latest diff --git a/charts/ingress-nginx/ci/deployment-opentelemetry-customregistry-values.yaml b/charts/ingress-nginx/ci/deployment-opentelemetry-customregistry-values.yaml index c588f902a..fa7e1e952 100644 --- a/charts/ingress-nginx/ci/deployment-opentelemetry-customregistry-values.yaml +++ b/charts/ingress-nginx/ci/deployment-opentelemetry-customregistry-values.yaml @@ -2,6 +2,3 @@ controller: kind: Deployment opentelemetry: enabled: true - image: - registry: registry.k8s.io - image: ingress-nginx/opentelemetry diff --git a/charts/ingress-nginx/templates/_helpers.tpl b/charts/ingress-nginx/templates/_helpers.tpl index 229f735b9..db1ab2e24 100644 --- a/charts/ingress-nginx/templates/_helpers.tpl +++ b/charts/ingress-nginx/templates/_helpers.tpl @@ -257,15 +257,17 @@ Extra modules. */}} {{- define "extraModules" -}} - name: {{ .name }} - image: {{ include "imageName" .image }}{{ include "ingress-nginx.imageDigest" .image }} + {{- with .image }} + image: {{ if .repository }}{{ .repository }}{{ else }}{{ .registry }}/{{ .image }}{{ end }}:{{ .tag }}{{ if .digest }}@{{ .digest }}{{ end }} command: - {{- if .image.distroless }} + {{- if .distroless }} - /init_module {{- else }} - sh - -c - /usr/local/bin/init_module.sh {{- end }} + {{- end }} {{- if .containerSecurityContext }} securityContext: {{ toYaml .containerSecurityContext | nindent 4 }} {{- end }} @@ -276,16 +278,3 @@ Extra modules. - name: modules mountPath: /modules_mount {{- end -}} - -{{/* -Image Name with optional registry and tag. -*/}} -{{- define "imageName" -}} -{{- if .registry -}} -{{- printf "%s/" .registry -}} -{{- end -}} -{{- printf "%s" .image -}} -{{- if .tag -}} -{{- printf ":%s" .tag -}} -{{- end -}} -{{- end -}} diff --git a/charts/ingress-nginx/values.yaml b/charts/ingress-nginx/values.yaml index 75f4885be..d1327d6eb 100644 --- a/charts/ingress-nginx/values.yaml +++ b/charts/ingress-nginx/values.yaml @@ -590,7 +590,11 @@ controller: # image: # registry: registry.k8s.io # image: ingress-nginx/mytestmodule - # tag: latest + # ## for backwards compatibility consider setting the full image url via the repository value below + # ## use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail + # ## repository: + # tag: "v1.0.0" + # digest: "" # distroless: false # containerSecurityContext: # runAsNonRoot: true @@ -614,6 +618,9 @@ controller: image: registry: registry.k8s.io image: ingress-nginx/opentelemetry + ## for backwards compatibility consider setting the full image url via the repository value below + ## use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail + ## repository: tag: "v20230721-3e2062ee5" digest: sha256:13bee3f5223883d3ca62fee7309ad02d22ec00ff0d7033e3e9aca7a9f60fd472 distroless: true