Modify --tinkerbell-bootstrap-ip flag to change boots CLI flags

The value provided in the flag is now used in the CLI arguments when running boots binary: --syslog-addr --tftp-addr --http-addr --dhcp-ip-for-packet --dhcp-syslog-ip --dhcp-tftp-ip --dhcp-http-ipxe-binary-url --dhcp-http-ipxe-script-url
aws · Oct 27, 2024 · f471fbb · f471fbb
1 parent e1d56ae
commit f471fbb
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/pkg/providers/tinkerbell/stack/stack.go b/pkg/providers/tinkerbell/stack/stack.go
@@ -259,6 +259,14 @@ func (s *Installer) installBootsOnDocker(ctx context.Context, bundle releasev1al
 		"-dhcp-addr", "0.0.0.0:67",
 		"-osie-url", osiePath,
 		"-tink-server", fmt.Sprintf("%s:%s", tinkServerIP, grpcPort),
+		"--syslog-addr", fmt.Sprintf("%s:514", tinkServerIP),
+		"--tftp-addr", fmt.Sprintf("%s:69", tinkServerIP),
+		"--http-addr", fmt.Sprintf("%s:80", tinkServerIP),
+		"--dhcp-ip-for-packet", fmt.Sprintf("%s", tinkServerIP),
+		"--dhcp-syslog-ip", fmt.Sprintf("%s", tinkServerIP),
+		"--dhcp-tftp-ip", fmt.Sprintf("%s:69", tinkServerIP),
+		"--dhcp-http-ipxe-binary-url", fmt.Sprintf("http://%s:8080/ipxe/", tinkServerIP),
+		"--dhcp-http-ipxe-script-url", fmt.Sprintf("http://%s/auto.ipxe", tinkServerIP),
 	}
 	if err := s.docker.Run(ctx, s.localRegistryURL(bundle.Boots.URI), boots, cmd, flags...); err != nil {
 		return fmt.Errorf("running boots with docker: %v", err)

diff --git a/pkg/providers/tinkerbell/stack/stack_test.go b/pkg/providers/tinkerbell/stack/stack_test.go
@@ -229,14 +229,28 @@ func TestTinkerbellStackInstallWithDifferentOptions(t *testing.T) {
 			if stackTest.installOnDocker {
 				docker.EXPECT().Run(ctx, "public.ecr.aws/eks-anywhere/boots:latest",
 					boots,
-					[]string{"-backend-kube-config", "/kubeconfig", "-dhcp-addr", "0.0.0.0:67", "-osie-url", "https://anywhere-assests.eks.amazonaws.com/tinkerbell/hook", "-tink-server", "1.2.3.4:42113"},
+					[]string{
+						"-backend-kube-config",
+						"/kubeconfig",
+						"-dhcp-addr", "0.0.0.0:67",
+						"-osie-url", "https://anywhere-assests.eks.amazonaws.com/tinkerbell/hook",
+						"-tink-server", "1.2.3.4:42113",
+						"--syslog-addr", fmt.Sprintf("%s:514", testIP),
+						"--tftp-addr", fmt.Sprintf("%s:69", testIP),
+						"--http-addr", fmt.Sprintf("%s:80", testIP),
+						"--dhcp-ip-for-packet", fmt.Sprintf("%s", testIP),
+						"--dhcp-syslog-ip", fmt.Sprintf("%s", testIP),
+						"--dhcp-tftp-ip", fmt.Sprintf("%s:69", testIP),
+						"--dhcp-http-ipxe-binary-url", fmt.Sprintf("http://%s:8080/ipxe/", testIP),
+						"--dhcp-http-ipxe-script-url", fmt.Sprintf("http://%s/auto.ipxe", testIP),
+					},
 					"-v", gomock.Any(),
 					"--network", "host",
 					"-e", gomock.Any(),
 					"-e", gomock.Any(),
 					"-e", gomock.Any(),
 					"-e", gomock.Any(),
-				)
+				).AnyTimes()
 			}
 
 			if err := s.Install(