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

revert to using ubuntu image to generate node join commands #4109

Merged
merged 1 commit into from
Oct 30, 2023
Merged

revert to using ubuntu image to generate node join commands #4109

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
8 changes: 1 addition & 7 deletions pkg/embeddedcluster/node_join.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,6 @@ func runAddNodeCommandPod(ctx context.Context, client kubernetes.Interface, node
}
}

// get the kotsadm image, as we know that will always exist
kotsadmImage, err := util.ThisImage(ctx, client)
if err != nil {
return "", fmt.Errorf("failed to get kotsadm image: %w", err)
}

hostPathFile := corev1.HostPathFile
hostPathDir := corev1.HostPathDirectory
_, err = client.CoreV1().Pods("kube-system").Create(ctx, &corev1.Pod{
Expand Down Expand Up @@ -149,7 +143,7 @@ func runAddNodeCommandPod(ctx context.Context, client kubernetes.Interface, node
Containers: []corev1.Container{
{
Name: "k0s-token-generator",
Image: kotsadmImage,
Image: "ubuntu:jammy", // this will not work on airgap, but it needs to be debian based at the moment
Command: []string{"/mnt/k0s"},
Args: []string{
"token",
Expand Down
Loading