diff --git a/pkg/providers/tinkerbell/stack/stack.go b/pkg/providers/tinkerbell/stack/stack.go index 3ab9939a3804..27d2b02fe528 100644 --- a/pkg/providers/tinkerbell/stack/stack.go +++ b/pkg/providers/tinkerbell/stack/stack.go @@ -236,7 +236,11 @@ func (s *Installer) installBootsOnDocker(ctx context.Context, bundle releasev1al flags := []string{ "-v", fmt.Sprintf("%s:/kubeconfig", kubeconfig), "--network", "host", - "-e", fmt.Sprintf("PUBLIC_IP=%s", tinkServerIP), + "-e", fmt.Sprintf("SMEE_DHCP_SYSLOG_IP=%s", tinkServerIP), + "-e", fmt.Sprintf("SMEE_DHCP_IP_FOR_PACKET=%s", tinkServerIP), + "-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), } @@ -542,8 +546,9 @@ func (s *Installer) createValuesOverride(bundle releasev1alpha1.TinkerbellBundle }, "http": map[string]interface{}{ "tinkServer": map[string]interface{}{ - "ip": tinkerbellIP, - port: grpcPort, + "ip": tinkerbellIP, + port: grpcPort, + "insecureTLS": true, }, "osieUrl": map[string]interface{}{ "scheme": osiePath.Scheme, diff --git a/pkg/providers/tinkerbell/stack/stack_test.go b/pkg/providers/tinkerbell/stack/stack_test.go index 92ae50d8c23e..1f71a1f08e29 100644 --- a/pkg/providers/tinkerbell/stack/stack_test.go +++ b/pkg/providers/tinkerbell/stack/stack_test.go @@ -236,6 +236,10 @@ func TestTinkerbellStackInstallWithDifferentOptions(t *testing.T) { "-e", gomock.Any(), "-e", gomock.Any(), "-e", gomock.Any(), + "-e", gomock.Any(), + "-e", gomock.Any(), + "-e", gomock.Any(), + "-e", gomock.Any(), ) } diff --git a/pkg/providers/tinkerbell/stack/testdata/expected_upgrade.yaml b/pkg/providers/tinkerbell/stack/testdata/expected_upgrade.yaml index 1b6a3ce862b5..ed2d688099d5 100755 --- a/pkg/providers/tinkerbell/stack/testdata/expected_upgrade.yaml +++ b/pkg/providers/tinkerbell/stack/testdata/expected_upgrade.yaml @@ -18,6 +18,7 @@ smee: tinkServer: ip: 1.2.3.4 port: "42113" + insecureTLS: true image: public.ecr.aws/eks-anywhere/boots:latest publicIP: 1.2.3.4 tinkWorkerImage: public.ecr.aws/eks-anywhere/tink-worker:latest diff --git a/pkg/providers/tinkerbell/stack/testdata/expected_upgrade_with_proxy.yaml b/pkg/providers/tinkerbell/stack/testdata/expected_upgrade_with_proxy.yaml index 86b43995b717..05722acce5db 100755 --- a/pkg/providers/tinkerbell/stack/testdata/expected_upgrade_with_proxy.yaml +++ b/pkg/providers/tinkerbell/stack/testdata/expected_upgrade_with_proxy.yaml @@ -21,6 +21,7 @@ smee: tinkServer: ip: 1.2.3.4 port: "42113" + insecureTLS: true image: public.ecr.aws/eks-anywhere/boots:latest publicIP: 1.2.3.4 tinkWorkerImage: public.ecr.aws/eks-anywhere/tink-worker:latest 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 index a93b9fa1033b..7d5eb83a03f3 100644 --- a/pkg/providers/tinkerbell/stack/testdata/expected_with_boots_on_docker.yaml +++ b/pkg/providers/tinkerbell/stack/testdata/expected_with_boots_on_docker.yaml @@ -19,6 +19,7 @@ smee: tinkServer: ip: 1.2.3.4 port: "42113" + insecureTLS: true image: public.ecr.aws/eks-anywhere/boots:latest publicIP: 1.2.3.4 tinkWorkerImage: public.ecr.aws/eks-anywhere/tink-worker:latest 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 index 1b6a3ce862b5..ed2d688099d5 100644 --- a/pkg/providers/tinkerbell/stack/testdata/expected_with_boots_on_kubernetes.yaml +++ b/pkg/providers/tinkerbell/stack/testdata/expected_with_boots_on_kubernetes.yaml @@ -18,6 +18,7 @@ smee: tinkServer: ip: 1.2.3.4 port: "42113" + insecureTLS: true image: public.ecr.aws/eks-anywhere/boots:latest publicIP: 1.2.3.4 tinkWorkerImage: public.ecr.aws/eks-anywhere/tink-worker:latest diff --git a/pkg/providers/tinkerbell/stack/testdata/expected_with_docker_options.yaml b/pkg/providers/tinkerbell/stack/testdata/expected_with_docker_options.yaml index 686eb9c0aa74..18f67e2e0f88 100644 --- a/pkg/providers/tinkerbell/stack/testdata/expected_with_docker_options.yaml +++ b/pkg/providers/tinkerbell/stack/testdata/expected_with_docker_options.yaml @@ -19,6 +19,7 @@ smee: tinkServer: ip: 1.2.3.4 port: "42113" + insecureTLS: true image: public.ecr.aws/eks-anywhere/boots:latest publicIP: 1.2.3.4 tinkWorkerImage: public.ecr.aws/eks-anywhere/tink-worker:latest diff --git a/pkg/providers/tinkerbell/stack/testdata/expected_with_hook_override.yaml b/pkg/providers/tinkerbell/stack/testdata/expected_with_hook_override.yaml index 4e8bd25a2d56..6ac2b8dc6187 100644 --- a/pkg/providers/tinkerbell/stack/testdata/expected_with_hook_override.yaml +++ b/pkg/providers/tinkerbell/stack/testdata/expected_with_hook_override.yaml @@ -18,6 +18,7 @@ smee: tinkServer: ip: 1.2.3.4 port: "42113" + insecureTLS: true image: public.ecr.aws/eks-anywhere/boots:latest publicIP: 1.2.3.4 tinkWorkerImage: public.ecr.aws/eks-anywhere/tink-worker:latest 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 index 1b6a3ce862b5..ed2d688099d5 100644 --- 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 @@ -18,6 +18,7 @@ smee: tinkServer: ip: 1.2.3.4 port: "42113" + insecureTLS: true image: public.ecr.aws/eks-anywhere/boots:latest publicIP: 1.2.3.4 tinkWorkerImage: public.ecr.aws/eks-anywhere/tink-worker:latest 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 index 00197bf8a368..d1982bf323ff 100644 --- 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 @@ -18,6 +18,7 @@ smee: tinkServer: ip: 1.2.3.4 port: "42113" + insecureTLS: true image: public.ecr.aws/eks-anywhere/boots:latest publicIP: 1.2.3.4 tinkWorkerImage: public.ecr.aws/eks-anywhere/tink-worker:latest diff --git a/pkg/providers/tinkerbell/stack/testdata/expected_with_kubernetes_options.yaml b/pkg/providers/tinkerbell/stack/testdata/expected_with_kubernetes_options.yaml index 91f9ec7bd143..4f0ea183b70f 100644 --- a/pkg/providers/tinkerbell/stack/testdata/expected_with_kubernetes_options.yaml +++ b/pkg/providers/tinkerbell/stack/testdata/expected_with_kubernetes_options.yaml @@ -18,6 +18,7 @@ smee: tinkServer: ip: 1.2.3.4 port: "42113" + insecureTLS: true image: public.ecr.aws/eks-anywhere/boots:latest publicIP: 1.2.3.4 tinkWorkerImage: public.ecr.aws/eks-anywhere/tink-worker:latest 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 index 1b6a3ce862b5..ed2d688099d5 100644 --- 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 @@ -18,6 +18,7 @@ smee: tinkServer: ip: 1.2.3.4 port: "42113" + insecureTLS: true image: public.ecr.aws/eks-anywhere/boots:latest publicIP: 1.2.3.4 tinkWorkerImage: public.ecr.aws/eks-anywhere/tink-worker:latest 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 index 91f9ec7bd143..4f0ea183b70f 100644 --- 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 @@ -18,6 +18,7 @@ smee: tinkServer: ip: 1.2.3.4 port: "42113" + insecureTLS: true image: public.ecr.aws/eks-anywhere/boots:latest publicIP: 1.2.3.4 tinkWorkerImage: public.ecr.aws/eks-anywhere/tink-worker:latest diff --git a/pkg/providers/tinkerbell/stack/testdata/expected_with_load_balancer_interface.yaml b/pkg/providers/tinkerbell/stack/testdata/expected_with_load_balancer_interface.yaml index 849577358681..f1b1235b04d6 100644 --- a/pkg/providers/tinkerbell/stack/testdata/expected_with_load_balancer_interface.yaml +++ b/pkg/providers/tinkerbell/stack/testdata/expected_with_load_balancer_interface.yaml @@ -18,6 +18,7 @@ smee: tinkServer: ip: 1.2.3.4 port: "42113" + insecureTLS: true image: public.ecr.aws/eks-anywhere/boots:latest publicIP: 1.2.3.4 tinkWorkerImage: public.ecr.aws/eks-anywhere/tink-worker:latest diff --git a/pkg/providers/tinkerbell/stack/testdata/expected_with_proxy_config.yaml b/pkg/providers/tinkerbell/stack/testdata/expected_with_proxy_config.yaml index b2109b02527c..7777a458bf5c 100644 --- a/pkg/providers/tinkerbell/stack/testdata/expected_with_proxy_config.yaml +++ b/pkg/providers/tinkerbell/stack/testdata/expected_with_proxy_config.yaml @@ -21,6 +21,7 @@ smee: tinkServer: ip: 1.2.3.4 port: "42113" + insecureTLS: true image: public.ecr.aws/eks-anywhere/boots:latest publicIP: 1.2.3.4 tinkWorkerImage: public.ecr.aws/eks-anywhere/tink-worker:latest diff --git a/pkg/providers/tinkerbell/stack/testdata/expected_with_registry_mirror.yaml b/pkg/providers/tinkerbell/stack/testdata/expected_with_registry_mirror.yaml index 81c174dbfc24..ef84608d74a3 100644 --- a/pkg/providers/tinkerbell/stack/testdata/expected_with_registry_mirror.yaml +++ b/pkg/providers/tinkerbell/stack/testdata/expected_with_registry_mirror.yaml @@ -21,6 +21,7 @@ smee: tinkServer: ip: 1.2.3.4 port: "42113" + insecureTLS: true image: public.ecr.aws/eks-anywhere/boots:latest publicIP: 1.2.3.4 tinkWorkerImage: 1.2.3.4:443/custom/eks-anywhere/tink-worker:latest