Skip to content
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

Jump to bottom

Expose CLI flag to tell Smee (Boots) on which interface to bind #8760

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Expose CLI flag to tell Smee (Boots) on which interface to bind #8760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
094005b
add --smee-bind-ip cli flag for cluster create command
Gedulis12 Sep 12, 2024
b37a856
add vaildation to check if ip in flag --smee-bind-ip flag can be used
Gedulis12 Sep 12, 2024
44cba96
add and update unit tests
Gedulis12 Sep 12, 2024
a95680d
update docs
Gedulis12 Sep 13, 2024
fdd24a4
Merge branch 'main' into feature/smee-ip-bind
Gedulis12 Oct 23, 2024
607542e
Merge branch 'aws:main' into feature/smee-ip-bind
Gedulis12 Oct 27, 2024
e1d56ae
Revert "add --smee-bind-ip cli flag for cluster create command"
Gedulis12 Oct 27, 2024
f471fbb
Modify --tinkerbell-bootstrap-ip flag to change boots CLI flags
Gedulis12 Oct 27, 2024
323e34c
fix golanggci-lint errors
Oct 30, 2024
3b4996e
Merge branch 'aws:main' into feature/smee-ip-bind
Gedulis12 Oct 30, 2024
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
8 changes: 8 additions & 0 deletions pkg/providers/tinkerbell/stack/stack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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", tinkServerIP,
"--dhcp-syslog-ip", 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)
Expand Down
18 changes: 16 additions & 2 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 @@ -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", testIP,
"--dhcp-syslog-ip", 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(
Expand Down