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

kubeadm: drop 1.28 and add 1.31 #557

Merged
merged 2 commits into from
Sep 13, 2024
Merged

kubeadm: drop 1.28 and add 1.31 #557

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a563c1
kubeadm: drop 1.28 and add 1.31
tormath1 Sep 12, 2024
22a5f75
kubeadm: bump etcd version to 3.5.16
tormath1 Sep 12, 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
15 changes: 8 additions & 7 deletions kola/tests/kubeadm/kubeadm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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 {
Expand Down