Add bootOptions to cp/md tinkerbellmachine template, fix unit-tests (#…

…9094) Signed-off-by: Rahul Ganesh <rahulgab@amazon.com> Co-authored-by: EKS Distro PR Bot <aws-model-rocket-bots+eksdistroprbot@amazon.com>
aws · Dec 20, 2024 · b35ad75 · b35ad75
1 parent 586f904
commit b35ad75
Show file tree

Hide file tree

Showing 24 changed files with 49 additions and 3 deletions.
diff --git a/pkg/providers/tinkerbell/config/template-cp.yaml b/pkg/providers/tinkerbell/config/template-cp.yaml
@@ -535,6 +535,8 @@ spec:
             matchLabels: {{ range $key, $value := .etcdHardwareSelector}}
               {{ $key }}: {{ $value}}
             {{- end }}
+      bootOptions:
+        bootMode: netboot
       templateOverride: |
 {{.etcdTemplateOverride | indent 8}}
     {{- end }}

diff --git a/pkg/providers/tinkerbell/config/template-md.yaml b/pkg/providers/tinkerbell/config/template-md.yaml
@@ -61,6 +61,8 @@ spec:
             matchLabels: {{ range $key, $value := .hardwareSelector}}
               {{ $key }}: {{ $value}}
             {{- end }}
+      bootOptions:
+        bootMode: netboot
       templateOverride: |
 {{.workertemplateOverride | indent 8}}
     {{- end}}

diff --git a/pkg/providers/tinkerbell/stack/stack.go b/pkg/providers/tinkerbell/stack/stack.go
@@ -241,8 +241,7 @@ func (s *Installer) installBootsOnDocker(ctx context.Context, bundle releasev1al
 		"-e", fmt.Sprintf("SMEE_DHCP_TFTP_IP=%s", tinkServerIP),
 		"-e", fmt.Sprintf("SMEE_DHCP_HTTP_IPXE_BINARY_HOST=%s", tinkServerIP),
 		"-e", fmt.Sprintf("SMEE_DHCP_HTTP_IPXE_SCRIPT_HOST=%s", tinkServerIP),
-		"-e", fmt.Sprintf("PUBLIC_SYSLOG_IP=%s", tinkServerIP),
-		"-e", fmt.Sprintf("BOOTS_KUBE_NAMESPACE=%v", s.namespace),
+		"-e", fmt.Sprintf("SMEE_BACKEND_KUBE_NAMESPACE=%v", s.namespace),
 	}
 
 	extraKernelArgList := s.getSmeeKernelArgs(bundle)

diff --git a/pkg/providers/tinkerbell/stack/stack_test.go b/pkg/providers/tinkerbell/stack/stack_test.go
@@ -239,7 +239,6 @@ func TestTinkerbellStackInstallWithDifferentOptions(t *testing.T) {
 					"-e", gomock.Any(),
 					"-e", gomock.Any(),
 					"-e", gomock.Any(),
-					"-e", gomock.Any(),
 				)
 			}
 

diff --git a/pkg/providers/tinkerbell/testdata/expected_kct.yaml b/pkg/providers/tinkerbell/testdata/expected_kct.yaml
@@ -41,6 +41,8 @@ spec:
         required:
         - labelSelector:
             matchLabels: 
+      bootOptions:
+        bootMode: netboot
       templateOverride: |
         global_timeout: 6000
         id: ""

diff --git a/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_cert_bundles_config_md.yaml b/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_cert_bundles_config_md.yaml
@@ -46,6 +46,8 @@ spec:
         - labelSelector:
             matchLabels: 
               type: worker
+      bootOptions:
+        bootMode: netboot
       templateOverride: |
         global_timeout: 6000
         id: ""

diff --git a/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_kernel_config_md.yaml b/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_kernel_config_md.yaml
@@ -46,6 +46,8 @@ spec:
         - labelSelector:
             matchLabels: 
               type: worker
+      bootOptions:
+        bootMode: netboot
       templateOverride: |
         global_timeout: 6000
         id: ""

diff --git a/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_ntp_config_md.yaml b/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_ntp_config_md.yaml
@@ -46,6 +46,8 @@ spec:
         - labelSelector:
             matchLabels: 
               type: worker
+      bootOptions:
+        bootMode: netboot
       templateOverride: |
         global_timeout: 6000
         id: ""

diff --git a/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_settings_config_md.yaml b/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_settings_config_md.yaml
@@ -46,6 +46,8 @@ spec:
         - labelSelector:
             matchLabels: 
               type: worker
+      bootOptions:
+        bootMode: netboot
       templateOverride: |
         global_timeout: 6000
         id: ""

diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_autoscaler_md.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_autoscaler_md.yaml
@@ -48,6 +48,8 @@ spec:
         - labelSelector:
             matchLabels: 
               type: worker
+      bootOptions:
+        bootMode: netboot
       templateOverride: |
         global_timeout: 6000
         id: ""

diff --git a/...testdata/expected_results_cluster_tinkerbell_bottlerocket_md_minimal_registry_mirror.yaml b/...testdata/expected_results_cluster_tinkerbell_bottlerocket_md_minimal_registry_mirror.yaml
@@ -46,6 +46,8 @@ spec:
         - labelSelector:
             matchLabels: 
               type: worker
+      bootOptions:
+        bootMode: netboot
       templateOverride: |
         global_timeout: 6000
         id: ""

diff --git a/...stdata/expected_results_cluster_tinkerbell_bottlerocket_md_registry_mirror_with_auth.yaml b/...stdata/expected_results_cluster_tinkerbell_bottlerocket_md_registry_mirror_with_auth.yaml
@@ -46,6 +46,8 @@ spec:
         - labelSelector:
             matchLabels: 
               type: worker
+      bootOptions:
+        bootMode: netboot
       templateOverride: |
         global_timeout: 6000
         id: ""

diff --git a/...stdata/expected_results_cluster_tinkerbell_bottlerocket_md_registry_mirror_with_cert.yaml b/...stdata/expected_results_cluster_tinkerbell_bottlerocket_md_registry_mirror_with_cert.yaml
@@ -46,6 +46,8 @@ spec:
         - labelSelector:
             matchLabels: 
               type: worker
+      bootOptions:
+        bootMode: netboot
       templateOverride: |
         global_timeout: 6000
         id: ""

diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_md.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_md.yaml
@@ -46,6 +46,8 @@ spec:
         - labelSelector:
             matchLabels: 
               type: worker
+      bootOptions:
+        bootMode: netboot
       templateOverride: |
         global_timeout: 6000
         id: ""

diff --git a/...s/tinkerbell/testdata/expected_results_cluster_tinkerbell_md_minimal_registry_mirror.yaml b/...s/tinkerbell/testdata/expected_results_cluster_tinkerbell_md_minimal_registry_mirror.yaml
@@ -46,6 +46,8 @@ spec:
         - labelSelector:
             matchLabels: 
               type: worker
+      bootOptions:
+        bootMode: netboot
       templateOverride: |
         global_timeout: 6000
         id: ""

diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_md_node_labels.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_md_node_labels.yaml
@@ -46,6 +46,8 @@ spec:
         - labelSelector:
             matchLabels: 
               type: worker
+      bootOptions:
+        bootMode: netboot
       templateOverride: |
         global_timeout: 6000
         id: ""

diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_md_node_taints.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_md_node_taints.yaml
@@ -46,6 +46,8 @@ spec:
         - labelSelector:
             matchLabels: 
               type: worker
+      bootOptions:
+        bootMode: netboot
       templateOverride: |
         global_timeout: 6000
         id: ""

diff --git a/...iders/tinkerbell/testdata/expected_results_cluster_tinkerbell_md_node_worker_version.yaml b/...iders/tinkerbell/testdata/expected_results_cluster_tinkerbell_md_node_worker_version.yaml
@@ -46,6 +46,8 @@ spec:
         - labelSelector:
             matchLabels: 
               type: worker
+      bootOptions:
+        bootMode: netboot
       templateOverride: |
         global_timeout: 6000
         id: ""
@@ -217,6 +219,8 @@ spec:
         - labelSelector:
             matchLabels: 
               type: worker
+      bootOptions:
+        bootMode: netboot
       templateOverride: |
         global_timeout: 6000
         id: ""

diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_md_proxy.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_md_proxy.yaml
@@ -46,6 +46,8 @@ spec:
         - labelSelector:
             matchLabels: 
               type: worker
+      bootOptions:
+        bootMode: netboot
       templateOverride: |
         global_timeout: 6000
         id: ""

diff --git a/...tinkerbell/testdata/expected_results_cluster_tinkerbell_md_registry_mirror_with_auth.yaml b/...tinkerbell/testdata/expected_results_cluster_tinkerbell_md_registry_mirror_with_auth.yaml
@@ -42,6 +42,8 @@ spec:
         - labelSelector:
             matchLabels: 
               type: worker
+      bootOptions:
+        bootMode: netboot
       templateOverride: |
         global_timeout: 6000
         id: ""

diff --git a/...tinkerbell/testdata/expected_results_cluster_tinkerbell_md_registry_mirror_with_cert.yaml b/...tinkerbell/testdata/expected_results_cluster_tinkerbell_md_registry_mirror_with_cert.yaml
@@ -46,6 +46,8 @@ spec:
         - labelSelector:
             matchLabels: 
               type: worker
+      bootOptions:
+        bootMode: netboot
       templateOverride: |
         global_timeout: 6000
         id: ""

diff --git a/pkg/providers/tinkerbell/testdata/expected_results_md_template.yaml b/pkg/providers/tinkerbell/testdata/expected_results_md_template.yaml
@@ -46,6 +46,8 @@ spec:
         - labelSelector:
             matchLabels: 
               type: worker
+      bootOptions:
+        bootMode: netboot
       templateOverride: |
         global_timeout: 6000
         id: ""

diff --git a/pkg/providers/tinkerbell/testdata/expected_results_tinkerbell_md_multiple_node_groups.yaml b/pkg/providers/tinkerbell/testdata/expected_results_tinkerbell_md_multiple_node_groups.yaml
@@ -46,6 +46,8 @@ spec:
         - labelSelector:
             matchLabels: 
               type: worker
+      bootOptions:
+        bootMode: netboot
       templateOverride: |
         global_timeout: 6000
         id: ""
@@ -216,6 +218,8 @@ spec:
         - labelSelector:
             matchLabels: 
               type: worker
+      bootOptions:
+        bootMode: netboot
       templateOverride: |
         global_timeout: 6000
         id: ""

diff --git a/pkg/providers/tinkerbell/testdata/expected_results_ubuntu_ntp_config_md.yaml b/pkg/providers/tinkerbell/testdata/expected_results_ubuntu_ntp_config_md.yaml
@@ -46,6 +46,8 @@ spec:
         - labelSelector:
             matchLabels: 
               type: worker
+      bootOptions:
+        bootMode: netboot
       templateOverride: |
         global_timeout: 6000
         id: ""