unittests for MigrateV1beta2V1beta3

Signed-off-by: Artiom Diomin <[email protected]>

pkg/apis/kubeone/config/migrate.go

@@ -76,7 +76,8 @@ func MigrateV1beta2V1beta3(clusterFilePath string) ([]byte, error) {
 		{
 			path: yamled.Path{"addons"},
 			convertor: func(p yamled.Path) {
-				if originalManifest.Has(p) {
+				// we moved helmReleases inside the addons
+				if originalManifest.Has(p) || originalManifest.Has(yamled.Path{"helmReleases"}) {
 					ybuf, _ := kyaml.Marshal(newManifest.Addons)
 					addons, _ := yamled.Load(bytes.NewBuffer(ybuf))
 					originalManifest.Set(p, addons)
@@ -86,6 +87,7 @@ func MigrateV1beta2V1beta3(clusterFilePath string) ([]byte, error) {
 		{
 			path: yamled.Path{"addons"},
 			convertor: func(p yamled.Path) {
+				// cleanup addons from all the nil/zero/invalid values
 				originalManifest.Walk(p, func(key yamled.Path, value any) {
 					refval := reflect.ValueOf(value)
 

pkg/apis/kubeone/config/migrate_test.go

@@ -0,0 +1,46 @@
+/*
+Copyright 2020 The KubeOne Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package config
+
+import (
+	"flag"
+	"testing"
+
+	"k8c.io/kubeone/pkg/testhelper"
+)
+
+var updateFlag = flag.Bool("update", false, "update testdata files")
+
+func TestV1Beta2ToV1Beta3Migration(t *testing.T) {
+	tests := []string{
+		"simple",
+		"just addons",
+		"helm",
+		"addons and helm",
+	}
+
+	for _, test := range tests {
+		t.Run(test, func(t *testing.T) {
+			got, err := MigrateV1beta2V1beta3(testhelper.TestDataFSName(t, "_v1beta2.yaml"))
+			if err != nil {
+				t.Fatalf("%s", err)
+			}
+
+			testhelper.DiffOutput(t, testhelper.FSGoldenName(t), string(got), *updateFlag)
+		})
+	}
+}

pkg/apis/kubeone/config/testdata/TestV1Beta2ToV1Beta3Migration-addons_and_helm.golden

@@ -0,0 +1,20 @@
+apiVersion: kubeone.k8c.io/v1beta3
+kind: KubeOneCluster
+versions:
+  kubernetes: 1.30.1
+addons:
+  addons:
+  - addon:
+      name: name1
+  - helmRelease:
+      chart: kube-state-metrics
+      namespace: kube-state-metrics
+      releaseName: ksm
+      repoURL: https://prometheus-community.github.io/helm-charts
+      timeout: 0s
+      values:
+      - valuesFile: ksm-values.yaml
+      - inline:
+          replicas: 3
+      version: 4.22.3
+  path: something

pkg/apis/kubeone/config/testdata/TestV1Beta2ToV1Beta3Migration-addons_and_helm_v1beta2.yaml

@@ -0,0 +1,22 @@
+apiVersion: kubeone.k8c.io/v1beta2
+kind: KubeOneCluster
+
+versions:
+  kubernetes: 1.30.1
+
+addons:
+  path: "something"
+
+  addons:
+    - name: "name1"
+
+helmReleases:
+  - releaseName: ksm
+    chart: kube-state-metrics
+    repoURL: https://prometheus-community.github.io/helm-charts
+    namespace: kube-state-metrics
+    version: 4.22.3
+    values:
+      - valuesFile: ksm-values.yaml
+      - inline:
+          replicas: 3

pkg/apis/kubeone/config/testdata/TestV1Beta2ToV1Beta3Migration-helm.golden

@@ -0,0 +1,17 @@
+apiVersion: kubeone.k8c.io/v1beta3
+kind: KubeOneCluster
+versions:
+  kubernetes: 1.30.1
+addons:
+  addons:
+  - helmRelease:
+      chart: kube-state-metrics
+      namespace: kube-state-metrics
+      releaseName: ksm
+      repoURL: https://prometheus-community.github.io/helm-charts
+      timeout: 0s
+      values:
+      - valuesFile: ksm-values.yaml
+      - inline:
+          replicas: 3
+      version: 4.22.3

pkg/apis/kubeone/config/testdata/TestV1Beta2ToV1Beta3Migration-helm_v1beta2.yaml

@@ -0,0 +1,16 @@
+apiVersion: kubeone.k8c.io/v1beta2
+kind: KubeOneCluster
+
+versions:
+  kubernetes: 1.30.1
+
+helmReleases:
+  - releaseName: ksm
+    chart: kube-state-metrics
+    repoURL: https://prometheus-community.github.io/helm-charts
+    namespace: kube-state-metrics
+    version: 4.22.3
+    values:
+      - valuesFile: ksm-values.yaml
+      - inline:
+          replicas: 3

pkg/apis/kubeone/config/testdata/TestV1Beta2ToV1Beta3Migration-just_addons.golden

@@ -0,0 +1,9 @@
+apiVersion: kubeone.k8c.io/v1beta3
+kind: KubeOneCluster
+versions:
+  kubernetes: 1.30.1
+addons:
+  addons:
+  - addon:
+      name: name1
+  path: something

pkg/apis/kubeone/config/testdata/TestV1Beta2ToV1Beta3Migration-just_addons_v1beta2.yaml

@@ -0,0 +1,11 @@
+apiVersion: kubeone.k8c.io/v1beta2
+kind: KubeOneCluster
+
+versions:
+  kubernetes: 1.30.1
+
+addons:
+  path: "something"
+
+  addons:
+    - name: "name1"

pkg/apis/kubeone/config/testdata/TestV1Beta2ToV1Beta3Migration-simple.golden

@@ -0,0 +1,4 @@
+apiVersion: kubeone.k8c.io/v1beta3
+kind: KubeOneCluster
+versions:
+  kubernetes: 1.30.1

pkg/apis/kubeone/config/testdata/TestV1Beta2ToV1Beta3Migration-simple_v1beta2.yaml

@@ -0,0 +1,5 @@
+apiVersion: kubeone.k8c.io/v1beta2
+kind: KubeOneCluster
+
+versions:
+  kubernetes: 1.30.1

pkg/testhelper/helper.go

@@ -26,10 +26,22 @@ import (
 	"github.com/pmezard/go-difflib/difflib"
 )
 
+func fsName(t *testing.T, ext ...string) string {
+	t.Helper()
+
+	return strings.Join(append([]string{strings.ReplaceAll(t.Name(), "/", "-")}, ext...), "")
+}
+
 func FSGoldenName(t *testing.T) string {
 	t.Helper()
 
-	return strings.ReplaceAll(t.Name(), "/", "-") + ".golden"
+	return fsName(t, ".golden")
+}
+
+func TestDataFSName(t *testing.T, ext ...string) string {
+	t.Helper()
+
+	return filepath.Join([]string{"testdata", fsName(t, ext...)}...)
 }
 
 func DiffOutput(t *testing.T, name, output string, update bool) {
@@ -40,7 +52,7 @@ func DiffOutput(t *testing.T, name, output string, update bool) {
 	}
 
 	if update {
-		if errw := os.WriteFile(golden, []byte(output), 0600); errw != nil {
+		if errw := os.WriteFile(golden, []byte(output), 0o600); errw != nil {
 			t.Fatalf("failed to write updated fixture: %v", errw)
 		}
 	}