Merge pull request #557 from flatcar/tormath1/kubernetes

kubeadm: drop 1.28 and add 1.31
flatcar · Sep 13, 2024 · e41a44c · e41a44c
2 parents cf464dd + 22a5f75
commit e41a44c
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/kola/tests/kubeadm/kubeadm.go b/kola/tests/kubeadm/kubeadm.go
@@ -76,7 +76,7 @@ var (
 	// testConfig holds params for various kubernetes releases
 	// and the nested params are used to render script templates
 	testConfig = map[string]map[string]interface{}{
-		"v1.30.1": map[string]interface{}{
+		"v1.31.0": map[string]interface{}{
 			"HelmVersion":     "v3.13.2",
 			"MinMajorVersion": 3374,
 			// from https://github.com/flannel-io/flannel/releases
@@ -89,7 +89,7 @@ var (
 			"PodSubnet":        "192.168.0.0/17",
 			"cgroupv1":         false,
 		},
-		"v1.29.2": map[string]interface{}{
+		"v1.30.1": map[string]interface{}{
 			"HelmVersion":     "v3.13.2",
 			"MinMajorVersion": 3374,
 			// from https://github.com/flannel-io/flannel/releases
@@ -102,7 +102,7 @@ var (
 			"PodSubnet":        "192.168.0.0/17",
 			"cgroupv1":         false,
 		},
-		"v1.28.7": map[string]interface{}{
+		"v1.29.2": map[string]interface{}{
 			"HelmVersion":     "v3.13.2",
 			"MinMajorVersion": 3374,
 			// from https://github.com/flannel-io/flannel/releases
@@ -119,17 +119,18 @@ var (
 	plog       = capnslog.NewPackageLogger("github.com/flatcar/mantle", "kola/tests/kubeadm")
 	etcdConfig = conf.ContainerLinuxConfig(`
 etcd:
+  version: 3.5.16
   advertise_client_urls: http://{PRIVATE_IPV4}:2379
   listen_client_urls: http://0.0.0.0:2379`)
 )
 
 func init() {
 	testConfigCgroupV1 := map[string]map[string]interface{}{}
-	testConfigCgroupV1["v1.28.7"] = map[string]interface{}{}
-	for k, v := range testConfig["v1.28.7"] {
-		testConfigCgroupV1["v1.28.7"][k] = v
+	testConfigCgroupV1["v1.29.2"] = map[string]interface{}{}
+	for k, v := range testConfig["v1.29.2"] {
+		testConfigCgroupV1["v1.29.2"][k] = v
 	}
-	testConfigCgroupV1["v1.28.7"]["cgroupv1"] = true
+	testConfigCgroupV1["v1.29.2"]["cgroupv1"] = true
 
 	registerTests := func(config map[string]map[string]interface{}) {
 		for version, params := range config {