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/cilium: bump tested versions #291

Merged
merged 4 commits into from
Feb 15, 2022
Merged

kubeadm/cilium: bump tested versions #291

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
63702ad
kubeadm: bump cilium-cli version
tormath1 Feb 14, 2022
8b1ac7b
kubeadm: add `CiliumVersion` parameter
tormath1 Feb 14, 2022
5c6bc2b
kubeadm/test: add `CiliumVersion` to the unitest
tormath1 Feb 14, 2022
d1744d9
changelog: add entry
tormath1 Feb 14, 2022
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 @@ -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))
Expand Down
9 changes: 6 additions & 3 deletions kola/tests/kubeadm/kubeadm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ var (
testConfig = map[string]map[string]interface{}{
"v1.23.0": map[string]interface{}{
"FlannelVersion": "v0.14.0",
"CiliumCLIVersion": "v0.9.0",
"CiliumVersion": "1.11.0",
"CiliumCLIVersion": "v0.10.2",
"CNIVersion": "v0.8.7",
"CRIctlVersion": "v1.22.0",
"ReleaseVersion": "v0.4.0",
Expand All @@ -68,7 +69,8 @@ var (
},
"v1.22.0": map[string]interface{}{
"FlannelVersion": "v0.14.0",
"CiliumCLIVersion": "v0.9.0",
"CiliumVersion": "1.11.0",
"CiliumCLIVersion": "v0.10.2",
"CNIVersion": "v0.8.7",
"CRIctlVersion": "v1.17.0",
"ReleaseVersion": "v0.4.0",
Expand All @@ -91,7 +93,8 @@ var (
},
"v1.21.0": map[string]interface{}{
"FlannelVersion": "v0.14.0",
"CiliumCLIVersion": "v0.9.0",
"CiliumVersion": "1.11.0",
"CiliumCLIVersion": "v0.10.2",
"CNIVersion": "v0.8.7",
"CRIctlVersion": "v1.17.0",
"ReleaseVersion": "v0.4.0",
Expand Down
2 changes: 2 additions & 0 deletions kola/tests/kubeadm/kubeadm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand Down Expand Up @@ -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"},
Expand Down
3 changes: 2 additions & 1 deletion kola/tests/kubeadm/templates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
3 changes: 2 additions & 1 deletion kola/tests/kubeadm/testdata/master-cilium-script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down