From 63702ad690fc21192c94c40a4371eb164f46a655 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Mon, 14 Feb 2022 14:56:59 +0100 Subject: [PATCH 1/4] kubeadm: bump cilium-cli version Signed-off-by: Mathieu Tortuyaux --- kola/tests/kubeadm/kubeadm.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kola/tests/kubeadm/kubeadm.go b/kola/tests/kubeadm/kubeadm.go index c44eec5f1..6855e51b6 100644 --- a/kola/tests/kubeadm/kubeadm.go +++ b/kola/tests/kubeadm/kubeadm.go @@ -45,7 +45,7 @@ var ( testConfig = map[string]map[string]interface{}{ "v1.23.0": map[string]interface{}{ "FlannelVersion": "v0.14.0", - "CiliumCLIVersion": "v0.9.0", + "CiliumCLIVersion": "v0.10.2", "CNIVersion": "v0.8.7", "CRIctlVersion": "v1.22.0", "ReleaseVersion": "v0.4.0", @@ -68,7 +68,7 @@ var ( }, "v1.22.0": map[string]interface{}{ "FlannelVersion": "v0.14.0", - "CiliumCLIVersion": "v0.9.0", + "CiliumCLIVersion": "v0.10.2", "CNIVersion": "v0.8.7", "CRIctlVersion": "v1.17.0", "ReleaseVersion": "v0.4.0", @@ -91,7 +91,7 @@ var ( }, "v1.21.0": map[string]interface{}{ "FlannelVersion": "v0.14.0", - "CiliumCLIVersion": "v0.9.0", + "CiliumCLIVersion": "v0.10.2", "CNIVersion": "v0.8.7", "CRIctlVersion": "v1.17.0", "ReleaseVersion": "v0.4.0", From 8b1ac7b0b8f8cdab264b3a8f0e3536f0171f06b5 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Mon, 14 Feb 2022 15:04:08 +0100 Subject: [PATCH 2/4] kubeadm: add `CiliumVersion` parameter in previous cilium-cli version, it was not possible to set the Cilium version from the CLI, we were relying on the compiled default version. it's now easier to update cilium itself and to know which version is actually being tested. Signed-off-by: Mathieu Tortuyaux --- kola/tests/kubeadm/kubeadm.go | 3 +++ kola/tests/kubeadm/templates.go | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/kola/tests/kubeadm/kubeadm.go b/kola/tests/kubeadm/kubeadm.go index 6855e51b6..80dcbedd4 100644 --- a/kola/tests/kubeadm/kubeadm.go +++ b/kola/tests/kubeadm/kubeadm.go @@ -45,6 +45,7 @@ var ( testConfig = map[string]map[string]interface{}{ "v1.23.0": map[string]interface{}{ "FlannelVersion": "v0.14.0", + "CiliumVersion": "1.11.0", "CiliumCLIVersion": "v0.10.2", "CNIVersion": "v0.8.7", "CRIctlVersion": "v1.22.0", @@ -68,6 +69,7 @@ var ( }, "v1.22.0": map[string]interface{}{ "FlannelVersion": "v0.14.0", + "CiliumVersion": "1.11.0", "CiliumCLIVersion": "v0.10.2", "CNIVersion": "v0.8.7", "CRIctlVersion": "v1.17.0", @@ -91,6 +93,7 @@ var ( }, "v1.21.0": map[string]interface{}{ "FlannelVersion": "v0.14.0", + "CiliumVersion": "1.11.0", "CiliumCLIVersion": "v0.10.2", "CNIVersion": "v0.8.7", "CRIctlVersion": "v1.17.0", diff --git a/kola/tests/kubeadm/templates.go b/kola/tests/kubeadm/templates.go index 5321928b1..7faa7ff40 100644 --- a/kola/tests/kubeadm/templates.go +++ b/kola/tests/kubeadm/templates.go @@ -361,7 +361,8 @@ EOF sudo tar -xf {{ .DownloadDir }}/cilium.tar.gz -C {{ .DownloadDir }} /opt/bin/cilium install \ --config enable-endpoint-routes=true \ - --config cluster-pool-ipv4-cidr={{ .PodSubnet }} + --config cluster-pool-ipv4-cidr={{ .PodSubnet }} \ + --version={{ .CiliumVersion }} # --wait will wait for status to report success /opt/bin/cilium status --wait {{ end }} From 5c6bc2ba5630f66902a3ce4679ec27e240718fd7 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Mon, 14 Feb 2022 15:05:45 +0100 Subject: [PATCH 3/4] kubeadm/test: add `CiliumVersion` to the unitest we assert that the cilium install script is correctly loaded with the cilium version. Signed-off-by: Mathieu Tortuyaux --- kola/tests/kubeadm/kubeadm_test.go | 2 ++ kola/tests/kubeadm/testdata/master-cilium-script.sh | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/kola/tests/kubeadm/kubeadm_test.go b/kola/tests/kubeadm/kubeadm_test.go index 0c13521f6..bde20e478 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{}{ + "CiliumVersion": "v0.11.1", "FlannelVersion": "v0.14.0", "CNI": CNI, "Endpoints": []string{"http://1.2.3.4:2379"}, @@ -83,6 +84,7 @@ func TestRenderTemplate(t *testing.T) { res, err := render( masterConfig, map[string]interface{}{ + "CiliumVersion": "v0.11.1", "CNI": "cilium", "CiliumCLIVersion": "v0.9.0", "Endpoints": []string{"http://1.2.3.4:2379"}, diff --git a/kola/tests/kubeadm/testdata/master-cilium-script.sh b/kola/tests/kubeadm/testdata/master-cilium-script.sh index 6ccb7ca6f..979ff6c3a 100644 --- a/kola/tests/kubeadm/testdata/master-cilium-script.sh +++ b/kola/tests/kubeadm/testdata/master-cilium-script.sh @@ -88,7 +88,8 @@ EOF sudo tar -xf /opt/bin/cilium.tar.gz -C /opt/bin /opt/bin/cilium install \ --config enable-endpoint-routes=true \ - --config cluster-pool-ipv4-cidr=192.168.0.0/17 + --config cluster-pool-ipv4-cidr=192.168.0.0/17 \ + --version=v0.11.1 # --wait will wait for status to report success /opt/bin/cilium status --wait From d1744d9d99a1462f71b3047237b1fba76c69e09e Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Mon, 14 Feb 2022 15:40:54 +0100 Subject: [PATCH 4/4] changelog: add entry Signed-off-by: Mathieu Tortuyaux --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0364b0b95..55fbfaae9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - removed `packet` occurrences in favor of `equinixmetal` ([#277](https://github.com/flatcar-linux/mantle/pull/277)) - kola: fixed cl.filesystem test for systemd 250 and newer ([#280](https://github.com/flatcar-linux/mantle/pull/280)) - PXE boots now over HTTPS on Equinix Metal ([#288](https://github.com/flatcar-linux/mantle/pull/288)) +- Bumped cilium tested version to 1.11.0 ([291](https://github.com/flatcar-linux/mantle/pull/291)) ### Removed - Remove `--repo-branch` option from cork ([#283](https://github.com/flatcar-linux/mantle/pull/283))