adds blanket variable to add containers into daemonset or deployment

Author: ab-andresc

charts/nginx-gateway-fabric/templates/deployment.yaml

@@ -165,9 +165,6 @@ spec:
         {{- with .Values.nginxGateway.extraVolumeMounts -}}
         {{ toYaml . | nindent 8 }}
         {{- end }}
-      {{- if .Values.nginxGateway.extraContainers }}
-      {{- toYaml .Values.nginxGateway.extraContainers | nindent 6 }}
-      {{- end }}              
       {{- if .Values.nginxGateway.topologySpreadConstraints }}
       topologySpreadConstraints:
         {{- toYaml .Values.nginxGateway.topologySpreadConstraints | nindent 8 }}

charts/nginx-gateway-fabric/templates/nginxproxy.yaml

@@ -26,6 +26,9 @@ spec:
         {{- if .Values.nginx.debug }}
         debug: {{ .Values.nginx.debug }}
         {{- end }}
+      {{- if .Values.nginxGateway.extraContainers }}
+      {{- toYaml .Values.nginxGateway.extraContainers | nindent 6 }}
+      {{- end }}
     {{- end }}
     {{- if eq .Values.nginx.kind "daemonSet" }}
     daemonSet:
@@ -42,6 +45,9 @@ spec:
         {{- if .Values.nginx.debug }}
         debug: {{ .Values.nginx.debug }}
         {{- end }}
+      {{- if .Values.nginxGateway.extraContainers }}
+      {{- toYaml .Values.nginxGateway.extraContainers | nindent 6 }}
+      {{- end }}
     {{- end }}
     {{- if .Values.nginx.service }}
     service:

internal/controller/provisioner/objects_test.go

@@ -673,7 +673,7 @@ func TestBuildNginxResourceObjects_DaemonSet(t *testing.T) {
 				},
 				ExtraContainers: []corev1.Container{
 					{
-						Image:           "hello-wordl:linux",
+						Image:           "hello-world:linux",
 						ImagePullPolicy: corev1.PullAlways,
 						Resources: corev1.ResourceRequirements{
 							Limits: corev1.ResourceList{
@@ -682,7 +682,7 @@ func TestBuildNginxResourceObjects_DaemonSet(t *testing.T) {
 						},
 					},
 					{
-						Image:           "hello-wordl:nanoserver-ltsc2025",
+						Image:           "hello-world:nanoserver-ltsc2025",
 						ImagePullPolicy: corev1.PullAlways,
 						Resources: corev1.ResourceRequirements{
 							Limits: corev1.ResourceList{
@@ -721,8 +721,19 @@ func TestBuildNginxResourceObjects_DaemonSet(t *testing.T) {
 	g.Expect(container.ImagePullPolicy).To(Equal(corev1.PullAlways))
 	g.Expect(container.Resources.Limits).To(HaveKey(corev1.ResourceCPU))
 	g.Expect(container.Resources.Limits[corev1.ResourceCPU].Format).To(Equal(resource.Format("100m")))
-}
 
+	extraContainerOne := template.Spec.Containers[1]
+	g.Expect(extraContainerOne.Image).To(Equal("hello-world:linux"))
+	g.Expect(extraContainerOne.ImagePullPolicy).To(Equal(corev1.PullAlways))
+	g.Expect(extraContainerOne.Resources.Limits).To(HaveKey(corev1.ResourceCPU))
+	g.Expect(extraContainerOne.Resources.Limits[corev1.ResourceCPU].Format).To(Equal(resource.Format("100m")))
+
+	extraContainerTwo := template.Spec.Containers[2]
+	g.Expect(extraContainerTwo.Image).To(Equal("hello-world:nanoserver-ltsc2025"))
+	g.Expect(extraContainerTwo.ImagePullPolicy).To(Equal(corev1.PullAlways))
+	g.Expect(extraContainerTwo.Resources.Limits).To(HaveKey(corev1.ResourceCPU))
+	g.Expect(extraContainerTwo.Resources.Limits[corev1.ResourceCPU].Format).To(Equal(resource.Format("100m")))
+}
 func TestBuildNginxResourceObjects_OpenShift(t *testing.T) {
 	t.Parallel()
 	g := NewWithT(t)