From fb35d87aa980fcf43e99a4d51ae31a2ce38ea032 Mon Sep 17 00:00:00 2001
From: patst <patrick.steinig@googlemail.com>
Date: Thu, 30 Nov 2023 18:45:13 +0100
Subject: [PATCH] Refactor template to generate the image name

* adapt test cases for extraModules
---
 .../ingress-nginx/ci/daemonset-extra-modules.yaml |  3 ++-
 ...tra-modules-default-container-sec-context.yaml |  3 ++-
 ...ra-modules-specific-container-sec-context.yaml |  3 ++-
 .../ci/deployment-extra-modules.yaml              |  3 ++-
 charts/ingress-nginx/templates/_helpers.tpl       | 15 ++++++++++++++-
 5 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/charts/ingress-nginx/ci/daemonset-extra-modules.yaml b/charts/ingress-nginx/ci/daemonset-extra-modules.yaml
index f299dbf1c..2c3aba281 100644
--- a/charts/ingress-nginx/ci/daemonset-extra-modules.yaml
+++ b/charts/ingress-nginx/ci/daemonset-extra-modules.yaml
@@ -7,4 +7,5 @@ controller:
     type: ClusterIP
   extraModules:
     - name: opentelemetry
-      image: busybox
+      image:
+        image: busybox
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 2310c344e..e95396f87 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
@@ -9,4 +9,5 @@ controller:
     allowPrivilegeEscalation: false
   extraModules:
     - name: opentelemetry
-      image: busybox
+      image:
+        image: busybox
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 bd2f011cc..b961d4dd0 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
@@ -7,6 +7,7 @@ controller:
     type: ClusterIP
   extraModules:
     - name: opentelemetry
-      image: busybox
+      image:
+        image: busybox
       containerSecurityContext:
         allowPrivilegeEscalation: false
diff --git a/charts/ingress-nginx/ci/deployment-extra-modules.yaml b/charts/ingress-nginx/ci/deployment-extra-modules.yaml
index ec5923548..69b5a1111 100644
--- a/charts/ingress-nginx/ci/deployment-extra-modules.yaml
+++ b/charts/ingress-nginx/ci/deployment-extra-modules.yaml
@@ -7,4 +7,5 @@ controller:
     type: ClusterIP
   extraModules:
     - name: opentelemetry
-      image: busybox
+      image:
+        image: busybox
diff --git a/charts/ingress-nginx/templates/_helpers.tpl b/charts/ingress-nginx/templates/_helpers.tpl
index 05a031cbd..229f735b9 100644
--- a/charts/ingress-nginx/templates/_helpers.tpl
+++ b/charts/ingress-nginx/templates/_helpers.tpl
@@ -257,7 +257,7 @@ Extra modules.
 */}}
 {{- define "extraModules" -}}
 - name: {{ .name }}
-  image: {{ printf "%s/%s:%s" .image.registry .image.image .image.tag }}{{ include "ingress-nginx.imageDigest" .image }}
+  image: {{ include "imageName" .image }}{{ include "ingress-nginx.imageDigest" .image }}
   command:
   {{- if .image.distroless }}
     - /init_module
@@ -276,3 +276,16 @@ 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 -}}