From 21f359a1f8251c122bfdd024fc9a835058aa6ee6 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Fri, 15 Oct 2021 15:45:29 +0200 Subject: [PATCH] test/kubeadm: fix flannel version to 0.14.0 it's also a good practice to not rely on the default master branch for the tests. so we don't have the pulling issue from: https://github.com/flannel-io/flannel/issues/1482 0.14.0 does not hold the changes related to flannel CNI plugin moved to its own repository in the latest release of CNI plugins. Signed-off-by: Mathieu Tortuyaux --- kola/tests/kubeadm/kubeadm.go | 2 ++ kola/tests/kubeadm/kubeadm_test.go | 1 + kola/tests/kubeadm/templates.go | 2 +- kola/tests/kubeadm/testdata/master-flannel-script.sh | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kola/tests/kubeadm/kubeadm.go b/kola/tests/kubeadm/kubeadm.go index 7650b47e8..1270a6cd9 100644 --- a/kola/tests/kubeadm/kubeadm.go +++ b/kola/tests/kubeadm/kubeadm.go @@ -44,6 +44,7 @@ var ( // and the nested params are used to render script templates testConfig = map[string]map[string]interface{}{ "v1.22.0": map[string]interface{}{ + "FlannelVersion": "v0.14.0", "CiliumCLIVersion": "v0.9.0", "CNIVersion": "v0.8.7", "CRIctlVersion": "v1.17.0", @@ -66,6 +67,7 @@ var ( }, }, "v1.21.0": map[string]interface{}{ + "FlannelVersion": "v0.14.0", "CiliumCLIVersion": "v0.9.0", "CNIVersion": "v0.8.7", "CRIctlVersion": "v1.17.0", diff --git a/kola/tests/kubeadm/kubeadm_test.go b/kola/tests/kubeadm/kubeadm_test.go index 5dd8e65b5..0c13521f6 100644 --- a/kola/tests/kubeadm/kubeadm_test.go +++ b/kola/tests/kubeadm/kubeadm_test.go @@ -54,6 +54,7 @@ func TestRenderTemplate(t *testing.T) { res, err := render( masterScript, map[string]interface{}{ + "FlannelVersion": "v0.14.0", "CNI": CNI, "Endpoints": []string{"http://1.2.3.4:2379"}, "Params": "amd64", diff --git a/kola/tests/kubeadm/templates.go b/kola/tests/kubeadm/templates.go index 6c53c693b..5321928b1 100644 --- a/kola/tests/kubeadm/templates.go +++ b/kola/tests/kubeadm/templates.go @@ -353,7 +353,7 @@ EOF kubectl apply -f calico.yaml {{ end }} {{ if eq .CNI "flannel" }} - curl -sSfL https://raw.githubusercontent.com/flannel-io/flannel/master/Documentation/kube-flannel.yml > kube-flannel.yml + curl -sSfL https://raw.githubusercontent.com/flannel-io/flannel/{{ .FlannelVersion }}/Documentation/kube-flannel.yml > kube-flannel.yml sed -i "s#10.244.0.0/16#{{ .PodSubnet }}#" kube-flannel.yml kubectl apply -f kube-flannel.yml {{ end }} diff --git a/kola/tests/kubeadm/testdata/master-flannel-script.sh b/kola/tests/kubeadm/testdata/master-flannel-script.sh index a3bfeb1fa..8632b2844 100644 --- a/kola/tests/kubeadm/testdata/master-flannel-script.sh +++ b/kola/tests/kubeadm/testdata/master-flannel-script.sh @@ -84,7 +84,7 @@ EOF - curl -sSfL https://raw.githubusercontent.com/flannel-io/flannel/master/Documentation/kube-flannel.yml > kube-flannel.yml + curl -sSfL https://raw.githubusercontent.com/flannel-io/flannel/v0.14.0/Documentation/kube-flannel.yml > kube-flannel.yml sed -i "s#10.244.0.0/16#192.168.0.0/17#" kube-flannel.yml kubectl apply -f kube-flannel.yml