Skip to content

Update smee flags for the latest version bump #9080

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 15, 2024
Merged

Update smee flags for the latest version bump #9080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions pkg/providers/tinkerbell/stack/stack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
}
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 4 additions & 0 deletions pkg/providers/tinkerbell/stack/stack_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
)
}

Expand Down
1 change: 1 addition & 0 deletions pkg/providers/tinkerbell/stack/testdata/expected_upgrade.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions pkg/providers/tinkerbell/stack/testdata/expected_upgrade_with_proxy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions pkg/providers/tinkerbell/stack/testdata/expected_with_boots_on_docker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions pkg/providers/tinkerbell/stack/testdata/expected_with_boots_on_kubernetes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions pkg/providers/tinkerbell/stack/testdata/expected_with_docker_options.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions pkg/providers/tinkerbell/stack/testdata/expected_with_hook_override.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions pkg/providers/tinkerbell/stack/testdata/expected_with_host_port_enabled_false.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions pkg/providers/tinkerbell/stack/testdata/expected_with_host_port_enabled_true.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions pkg/providers/tinkerbell/stack/testdata/expected_with_kubernetes_options.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions pkg/providers/tinkerbell/stack/testdata/expected_with_load_balancer_enabled_false.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions pkg/providers/tinkerbell/stack/testdata/expected_with_load_balancer_enabled_true.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions pkg/providers/tinkerbell/stack/testdata/expected_with_load_balancer_interface.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions pkg/providers/tinkerbell/stack/testdata/expected_with_proxy_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions pkg/providers/tinkerbell/stack/testdata/expected_with_registry_mirror.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading