Fix default k8s snap channel

This commit ensures that the "-classic/edge" channel is used if no snap channel, revision or path is provided. We cannot use "stable" since we don't have a stable channel yet.
canonical · Dec 5, 2024 · c59f679 · c59f679
1 parent da28413
commit c59f679
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/pkg/cloudinit/common.go b/pkg/cloudinit/common.go
@@ -73,10 +73,11 @@ func NewBaseCloudConfig(data BaseUserData) (CloudConfig, error) {
 
 	snapInstall := data.SnapInstallData
 	// Default to k8s version if snap install option is not set or empty.
-	if snapInstall == nil {
+	if snapInstall == nil || snapInstall.Option == "" {
+		// TODO: consider using "stable" once we'll have a stable channel.
 		snapInstall = &SnapInstallData{
 			Option: InstallOptionChannel,
-			Value:  fmt.Sprintf("%d.%d-classic/stable", kubernetesVersion.Major(), kubernetesVersion.Minor()),
+			Value:  fmt.Sprintf("%d.%d-classic/edge", kubernetesVersion.Major(), kubernetesVersion.Minor()),
 		}
 	}
 

diff --git a/pkg/cloudinit/controlplane_init_test.go b/pkg/cloudinit/controlplane_init_test.go
@@ -246,7 +246,7 @@ func TestNewInitControlPlaneSnapInstall(t *testing.T) {
 		g.Expect(err).NotTo(HaveOccurred())
 		g.Expect(config.WriteFiles).To(ContainElement(gstruct.MatchFields(gstruct.IgnoreExtras, gstruct.Fields{
 			"Path":    Equal(fmt.Sprintf("/capi/etc/snap-%s", cloudinit.InstallOptionChannel)),
-			"Content": Equal("1.30-classic/stable"),
+			"Content": Equal("1.30-classic/edge"),
 		})))
 		g.Expect(config.WriteFiles).ToNot(ContainElement(HaveField("Path", fmt.Sprintf("/capi/etc/snap-%s", cloudinit.InstallOptionRevision))))
 		g.Expect(config.WriteFiles).ToNot(ContainElement(HaveField("Path", fmt.Sprintf("/capi/etc/snap-%s", cloudinit.InstallOptionLocalPath))))

diff --git a/pkg/cloudinit/controlplane_join_test.go b/pkg/cloudinit/controlplane_join_test.go
@@ -202,7 +202,7 @@ func TestNewJoinControlPlaneSnapInstall(t *testing.T) {
 		g.Expect(err).NotTo(HaveOccurred())
 		g.Expect(config.WriteFiles).To(ContainElement(gstruct.MatchFields(gstruct.IgnoreExtras, gstruct.Fields{
 			"Path":    Equal(fmt.Sprintf("/capi/etc/snap-%s", cloudinit.InstallOptionChannel)),
-			"Content": Equal("1.30-classic/stable"),
+			"Content": Equal("1.30-classic/edge"),
 		})))
 		g.Expect(config.WriteFiles).ToNot(ContainElement(HaveField("Path", fmt.Sprintf("/capi/etc/snap-%s", cloudinit.InstallOptionRevision))))
 		g.Expect(config.WriteFiles).ToNot(ContainElement(HaveField("Path", fmt.Sprintf("/capi/etc/snap-%s", cloudinit.InstallOptionLocalPath))))

diff --git a/pkg/cloudinit/worker_join_test.go b/pkg/cloudinit/worker_join_test.go
@@ -203,7 +203,7 @@ func TestNewJoinWorkerSnapInstall(t *testing.T) {
 		g.Expect(err).NotTo(HaveOccurred())
 		g.Expect(config.WriteFiles).To(ContainElement(gstruct.MatchFields(gstruct.IgnoreExtras, gstruct.Fields{
 			"Path":    Equal(fmt.Sprintf("/capi/etc/snap-%s", cloudinit.InstallOptionChannel)),
-			"Content": Equal("1.30-classic/stable"),
+			"Content": Equal("1.30-classic/edge"),
 		})))
 		g.Expect(config.WriteFiles).ToNot(ContainElement(HaveField("Path", fmt.Sprintf("/capi/etc/snap-%s", cloudinit.InstallOptionRevision))))
 		g.Expect(config.WriteFiles).ToNot(ContainElement(HaveField("Path", fmt.Sprintf("/capi/etc/snap-%s", cloudinit.InstallOptionLocalPath))))