From cd64df30073d06be8d4ab00c34f40da798dcf8f1 Mon Sep 17 00:00:00 2001 From: patst Date: Tue, 18 Apr 2023 09:07:16 +0200 Subject: [PATCH] feat: allow configuration of registry, image, tag and digest in single values for opentelemetry addon * add ci test file --- .../ci/deployment-opentelemetry-customregistry-values.yaml | 6 ++++++ charts/ingress-nginx/templates/controller-deployment.yaml | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 charts/ingress-nginx/ci/deployment-opentelemetry-customregistry-values.yaml diff --git a/charts/ingress-nginx/ci/deployment-opentelemetry-customregistry-values.yaml b/charts/ingress-nginx/ci/deployment-opentelemetry-customregistry-values.yaml new file mode 100644 index 000000000..2acdb872a --- /dev/null +++ b/charts/ingress-nginx/ci/deployment-opentelemetry-customregistry-values.yaml @@ -0,0 +1,6 @@ +controller: + kind: Deployment + opentelemetry: + enabled: true + image: + registry: mycontainerreg.some.io diff --git a/charts/ingress-nginx/templates/controller-deployment.yaml b/charts/ingress-nginx/templates/controller-deployment.yaml index 323d87623..878b21a78 100644 --- a/charts/ingress-nginx/templates/controller-deployment.yaml +++ b/charts/ingress-nginx/templates/controller-deployment.yaml @@ -189,8 +189,9 @@ spec: {{- end }} {{- end }} {{- if .Values.controller.opentelemetry.enabled}} - {{ $otelContainerSecurityContext := $.Values.controller.opentelemetry.containerSecurityContext | default $.Values.controller.containerSecurityContext }} - {{- include "extraModules" (dict "name" "opentelemetry" "image" .Values.controller.opentelemetry.image "containerSecurityContext" $otelContainerSecurityContext) | nindent 8}} + {{- $otelContainerSecurityContext := $.Values.controller.opentelemetry.containerSecurityContext | default $.Values.controller.containerSecurityContext }} + {{- $fullImage := printf "%s/%s:%s@%s" .Values.controller.opentelemetry.image.registry .Values.controller.opentelemetry.image.image .Values.controller.opentelemetry.image.tag .Values.controller.opentelemetry.image.digest }} + {{- include "extraModules" (dict "name" "opentelemetry" "image" $fullImage "containerSecurityContext" $otelContainerSecurityContext) | nindent 8}} {{- end}} {{- end }} {{- if .Values.controller.hostNetwork }}