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

kubeadm : upgrade CiliumCLI to 0.9.0 #230

Merged
merged 4 commits into from
Sep 8, 2021
Merged

kubeadm : upgrade CiliumCLI to 0.9.0 #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6fb64f5
kola/test/kubeadm: rename `CiliumVersion` to `CiliumCLIVersion`
tormath1 Sep 8, 2021
e7136cb
kola/test/kubeadm: bump cilium CLI to 0.9.0
tormath1 Sep 8, 2021
20044c8
changelog: add entry
tormath1 Sep 8, 2021
222dbf3
kola/test/kubeadm: exclude `kubeadm.calico` from `arm64` tests
tormath1 Sep 8, 2021
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Enabled `docker.selinux` test for ARM64 ([#225](https://github.com/kinvolk/mantle/pull/225))
- Fixed `amd64` checksums for Kubernetes `v1.21.0` tests ([#226](https://github.com/kinvolk/mantle/pull/226))
- Used `clc` to set `enable_v2` option ([#227](https://github.com/kinvolk/mantle/pull/227))
- Bumped `CiliumCLI` version to pull `Cilium-1.10.4` ([#240](https://github.com/kinvolk/mantle/pull/230))

### Removed

Expand Down
31 changes: 19 additions & 12 deletions kola/tests/kubeadm/kubeadm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ var (
// and the nested params are used to render script templates
testConfig = map[string]map[string]interface{}{
"v1.22.0": map[string]interface{}{
"CiliumVersion": "v0.8.3",
"CNIVersion": "v0.8.7",
"CRIctlVersion": "v1.17.0",
"ReleaseVersion": "v0.4.0",
"DownloadDir": "/opt/bin",
"PodSubnet": "192.168.0.0/17",
"CiliumCLIVersion": "v0.9.0",
"CNIVersion": "v0.8.7",
"CRIctlVersion": "v1.17.0",
"ReleaseVersion": "v0.4.0",
"DownloadDir": "/opt/bin",
"PodSubnet": "192.168.0.0/17",
"arm64": map[string]string{
"KubeadmSum": "bdc32d358eba328a16b515cb1b7b1fd76bb5951ed5c6e1ea845798f13e6415e040e5f150030bd446e6eb6096533136780aef263b2a9c38ba11536c4415212be0",
"KubeletSum": "39953c3dce3dd579b1601859681ee81825b3bc3fdf764a097b31c01277bc8afc23693599ec4c1065d8844e1fed91f5edea558b33648794f084fc495efe623f88",
Expand All @@ -66,12 +66,12 @@ var (
},
},
"v1.21.0": map[string]interface{}{
"CiliumVersion": "v0.8.3",
"CNIVersion": "v0.8.7",
"CRIctlVersion": "v1.17.0",
"ReleaseVersion": "v0.4.0",
"DownloadDir": "/opt/bin",
"PodSubnet": "192.168.0.0/17",
"CiliumCLIVersion": "v0.9.0",
"CNIVersion": "v0.8.7",
"CRIctlVersion": "v1.17.0",
"ReleaseVersion": "v0.4.0",
"DownloadDir": "/opt/bin",
"PodSubnet": "192.168.0.0/17",
"arm64": map[string]string{
"KubeadmSum": "96248c47e809f88675d932bd8479cc1c170abb958be204965812235fb0173e788a91c46760a274a43cc56af3de4133f8ea1f5daf4f431410dbba043836e775d5",
"KubeletSum": "fc2a7e3ae6d44c0e384067f8e0bcd47b0db120d03d06cc8589c601f618792959ea894cf3325df8ab4902af23ded7fd875cf4fe718be0e67ad990a7559e4a8b1a",
Expand Down Expand Up @@ -112,13 +112,20 @@ func init() {
testParams["CNI"] = CNI
testParams["Release"] = version

architectures := []string{"amd64"}

if CNI != "calico" {
architectures = append(architectures, "arm64")
}

register.Register(&register.Test{
Name: fmt.Sprintf("kubeadm.%s.%s.base", version, CNI),
Distros: []string{"cl"},
ExcludePlatforms: []string{"esx"},
Run: func(c cluster.TestCluster) {
kubeadmBaseTest(c, testParams)
},
Architectures: architectures,
})
}
}
Expand Down
20 changes: 10 additions & 10 deletions kola/tests/kubeadm/kubeadm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,16 +82,16 @@ func TestRenderTemplate(t *testing.T) {
res, err := render(
masterConfig,
map[string]interface{}{
"CNI": "cilium",
"CiliumVersion": "v0.8.3",
"Endpoints": []string{"http://1.2.3.4:2379"},
"Arch": arch,
"CNIVersion": "v0.8.7",
"CRIctlVersion": "v1.17.0",
"ReleaseVersion": "v0.4.0",
"Release": "v1.21.0",
"DownloadDir": "/opt/bin",
"PodSubnet": "192.168.0.0/17",
"CNI": "cilium",
"CiliumCLIVersion": "v0.9.0",
"Endpoints": []string{"http://1.2.3.4:2379"},
"Arch": arch,
"CNIVersion": "v0.8.7",
"CRIctlVersion": "v1.17.0",
"ReleaseVersion": "v0.4.0",
"Release": "v1.21.0",
"DownloadDir": "/opt/bin",
"PodSubnet": "192.168.0.0/17",
"arm64": map[string]string{
"KubeadmSum": "96248c47e809f88675d932bd8479cc1c170abb958be204965812235fb0173e788a91c46760a274a43cc56af3de4133f8ea1f5daf4f431410dbba043836e775d5",
"KubeletSum": "fc2a7e3ae6d44c0e384067f8e0bcd47b0db120d03d06cc8589c601f618792959ea894cf3325df8ab4902af23ded7fd875cf4fe718be0e67ad990a7559e4a8b1a",
Expand Down
2 changes: 1 addition & 1 deletion kola/tests/kubeadm/templates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ storage:
mode: 0755
contents:
remote:
url: https://github.com/cilium/cilium-cli/releases/download/{{ .CiliumVersion }}/cilium-linux-{{ .Arch }}.tar.gz
url: https://github.com/cilium/cilium-cli/releases/download/{{ .CiliumCLIVersion }}/cilium-linux-{{ .Arch }}.tar.gz
{{ end }}
- path: /home/core/install.sh
filesystem: root
Expand Down
2 changes: 1 addition & 1 deletion kola/tests/kubeadm/testdata/master-cilium-amd64-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ storage:
mode: 0755
contents:
remote:
url: https://github.com/cilium/cilium-cli/releases/download/v0.8.3/cilium-linux-amd64.tar.gz
url: https://github.com/cilium/cilium-cli/releases/download/v0.9.0/cilium-linux-amd64.tar.gz

- path: /home/core/install.sh
filesystem: root
Expand Down
2 changes: 1 addition & 1 deletion kola/tests/kubeadm/testdata/master-cilium-arm64-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ storage:
mode: 0755
contents:
remote:
url: https://github.com/cilium/cilium-cli/releases/download/v0.8.3/cilium-linux-arm64.tar.gz
url: https://github.com/cilium/cilium-cli/releases/download/v0.9.0/cilium-linux-arm64.tar.gz

- path: /home/core/install.sh
filesystem: root
Expand Down