Override the nginx image properly in tinkerbell stack chart (#8318)

aws · Jun 13, 2024 · 7a1812c · 7a1812c
1 parent 1b6b82e
commit 7a1812c
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 0 deletions.
diff --git a/pkg/providers/tinkerbell/stack/stack.go b/pkg/providers/tinkerbell/stack/stack.go
@@ -558,6 +558,7 @@ func (s *Installer) createValuesOverride(bundle releasev1alpha1.TinkerbellBundle
 			},
 		},
 		stack: map[string]interface{}{
+			image: bundle.TinkerbellStack.Tink.Nginx.URI,
 			kubevip: map[string]interface{}{
 				image:   bundle.KubeVip.URI,
 				enabled: s.loadBalancer,

diff --git a/pkg/providers/tinkerbell/stack/stack_test.go b/pkg/providers/tinkerbell/stack/stack_test.go
@@ -42,6 +42,7 @@ func getTinkBundle() releasev1alpha1.TinkerbellBundle {
 	return releasev1alpha1.TinkerbellBundle{
 		TinkerbellStack: releasev1alpha1.TinkerbellStackBundle{
 			Tink: releasev1alpha1.TinkBundle{
+				Nginx:          releasev1alpha1.Image{URI: "public.ecr.aws/eks-anywhere/nginx:latest"},
 				TinkController: releasev1alpha1.Image{URI: "public.ecr.aws/eks-anywhere/tink-controller:latest"},
 				TinkServer:     releasev1alpha1.Image{URI: "public.ecr.aws/eks-anywhere/tink-server:latest"},
 				TinkWorker:     releasev1alpha1.Image{URI: "public.ecr.aws/eks-anywhere/tink-worker:latest"},

diff --git a/pkg/providers/tinkerbell/stack/testdata/expected_upgrade.yaml b/pkg/providers/tinkerbell/stack/testdata/expected_upgrade.yaml
@@ -34,6 +34,7 @@ stack:
   hook:
     enabled: false
   hostNetwork: false
+  image: public.ecr.aws/eks-anywhere/nginx:latest
   kubevip:
     additionalEnv:
     - name: prometheus_server

diff --git a/pkg/providers/tinkerbell/stack/testdata/expected_upgrade_with_proxy.yaml b/pkg/providers/tinkerbell/stack/testdata/expected_upgrade_with_proxy.yaml
@@ -35,6 +35,7 @@ stack:
   hook:
     enabled: false
   hostNetwork: false
+  image: public.ecr.aws/eks-anywhere/nginx:latest
   kubevip:
     additionalEnv:
     - name: prometheus_server

diff --git a/pkg/providers/tinkerbell/stack/testdata/expected_with_boots_on_docker.yaml b/pkg/providers/tinkerbell/stack/testdata/expected_with_boots_on_docker.yaml
@@ -34,6 +34,7 @@ stack:
   hook:
     enabled: false
   hostNetwork: false
+  image: public.ecr.aws/eks-anywhere/nginx:latest
   kubevip:
     additionalEnv:
     - name: prometheus_server

diff --git a/pkg/providers/tinkerbell/stack/testdata/expected_with_boots_on_kubernetes.yaml b/pkg/providers/tinkerbell/stack/testdata/expected_with_boots_on_kubernetes.yaml
@@ -34,6 +34,7 @@ stack:
   hook:
     enabled: false
   hostNetwork: false
+  image: public.ecr.aws/eks-anywhere/nginx:latest
   kubevip:
     additionalEnv:
     - name: prometheus_server

diff --git a/pkg/providers/tinkerbell/stack/testdata/expected_with_docker_options.yaml b/pkg/providers/tinkerbell/stack/testdata/expected_with_docker_options.yaml
@@ -34,6 +34,7 @@ stack:
   hook:
     enabled: false
   hostNetwork: true
+  image: public.ecr.aws/eks-anywhere/nginx:latest
   kubevip:
     additionalEnv:
     - name: prometheus_server

diff --git a/pkg/providers/tinkerbell/stack/testdata/expected_with_hook_override.yaml b/pkg/providers/tinkerbell/stack/testdata/expected_with_hook_override.yaml
@@ -34,6 +34,7 @@ stack:
   hook:
     enabled: false
   hostNetwork: false
+  image: public.ecr.aws/eks-anywhere/nginx:latest
   kubevip:
     additionalEnv:
     - name: prometheus_server

diff --git a/pkg/providers/tinkerbell/stack/testdata/expected_with_host_port_enabled_false.yaml b/pkg/providers/tinkerbell/stack/testdata/expected_with_host_port_enabled_false.yaml
@@ -34,6 +34,7 @@ stack:
   hook:
     enabled: false
   hostNetwork: false
+  image: public.ecr.aws/eks-anywhere/nginx:latest
   kubevip:
     additionalEnv:
     - name: prometheus_server

diff --git a/pkg/providers/tinkerbell/stack/testdata/expected_with_host_port_enabled_true.yaml b/pkg/providers/tinkerbell/stack/testdata/expected_with_host_port_enabled_true.yaml
@@ -34,6 +34,7 @@ stack:
   hook:
     enabled: false
   hostNetwork: true
+  image: public.ecr.aws/eks-anywhere/nginx:latest
   kubevip:
     additionalEnv:
     - name: prometheus_server

diff --git a/pkg/providers/tinkerbell/stack/testdata/expected_with_kubernetes_options.yaml b/pkg/providers/tinkerbell/stack/testdata/expected_with_kubernetes_options.yaml
@@ -34,6 +34,7 @@ stack:
   hook:
     enabled: false
   hostNetwork: false
+  image: public.ecr.aws/eks-anywhere/nginx:latest
   kubevip:
     additionalEnv:
     - name: prometheus_server

diff --git a/pkg/providers/tinkerbell/stack/testdata/expected_with_load_balancer_enabled_false.yaml b/pkg/providers/tinkerbell/stack/testdata/expected_with_load_balancer_enabled_false.yaml
@@ -34,6 +34,7 @@ stack:
   hook:
     enabled: false
   hostNetwork: false
+  image: public.ecr.aws/eks-anywhere/nginx:latest
   kubevip:
     additionalEnv:
     - name: prometheus_server

diff --git a/pkg/providers/tinkerbell/stack/testdata/expected_with_load_balancer_enabled_true.yaml b/pkg/providers/tinkerbell/stack/testdata/expected_with_load_balancer_enabled_true.yaml
@@ -34,6 +34,7 @@ stack:
   hook:
     enabled: false
   hostNetwork: false
+  image: public.ecr.aws/eks-anywhere/nginx:latest
   kubevip:
     additionalEnv:
     - name: prometheus_server

diff --git a/pkg/providers/tinkerbell/stack/testdata/expected_with_proxy_config.yaml b/pkg/providers/tinkerbell/stack/testdata/expected_with_proxy_config.yaml
@@ -35,6 +35,7 @@ stack:
   hook:
     enabled: false
   hostNetwork: false
+  image: public.ecr.aws/eks-anywhere/nginx:latest
   kubevip:
     additionalEnv:
     - name: prometheus_server

diff --git a/pkg/providers/tinkerbell/stack/testdata/expected_with_registry_mirror.yaml b/pkg/providers/tinkerbell/stack/testdata/expected_with_registry_mirror.yaml
@@ -38,6 +38,7 @@ stack:
   hook:
     enabled: false
   hostNetwork: false
+  image: public.ecr.aws/eks-anywhere/nginx:latest
   kubevip:
     additionalEnv:
     - name: prometheus_server