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 #365

Merged
merged 4 commits into from
Aug 31, 2022
Merged

kubeadm/cilium: bump tested versions #365

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
d8b8eb3
kubeadm/cilium: bump CLI and tested Cilium version
tormath1 Aug 30, 2022
e8e9751
kubeadm/cilium: patch Cilium daemon set
tormath1 Aug 30, 2022
853f628
kubeadm/cilium: disable SELinux for Cilium
tormath1 Aug 30, 2022
a6333e0
changelog: add entry
tormath1 Aug 31, 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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Bumped Kubernetes binaries and CNI versions ([#297](https://github.com/flatcar-linux/mantle/pull/297))
- GCP images are now published/tested with UEFI boot mode ([#322](https://github.com/flatcar-linux/mantle/pull/322))
- Bumped Go version to 1.19 ([#352](https://github.com/flatcar-linux/mantle/pull/352))
- Bumped Cilium version to 1.12.1 ([#365](https://github.com/flatcar-linux/mantle/pull/365))
- Set SELinux in permissive mode for Cilium ([#365](https://github.com/flatcar-linux/mantle/pull/365))

### Removed
- Remove `--repo-branch` option from cork ([#283](https://github.com/flatcar-linux/mantle/pull/283))
Expand Down
22 changes: 13 additions & 9 deletions kola/tests/kubeadm/kubeadm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,12 @@ var (
_ = c.MustSSH(controller, "/opt/bin/cilium uninstall")
version := params["CiliumVersion"].(string)
cidr := params["PodSubnet"].(string)
cmd := fmt.Sprintf("/opt/bin/cilium install --config enable-endpoint-routes=true --config cluster-pool-ipv4-cidr=%s --version=%s --encryption=ipsec --wait --wait-duration 1m", cidr, version)
_ = c.MustSSH(controller, cmd)
cmd := fmt.Sprintf("/opt/bin/cilium install --config enable-endpoint-routes=true --config cluster-pool-ipv4-cidr=%s --version=%s --encryption=ipsec --wait=false --restart-unmanaged-pods=false --rollback=false", cidr, version)
_, _ = c.SSH(controller, cmd)
patch := `/opt/bin/kubectl --namespace kube-system patch daemonset/cilium -p '{"spec":{"template":{"spec":{"containers":[{"name":"cilium-agent","securityContext":{"seLinuxOptions":{"level":"s0","type":"unconfined_t"}}}],"initContainers":[{"name":"mount-cgroup","securityContext":{"seLinuxOptions":{"level":"s0","type":"unconfined_t"}}},{"name":"apply-sysctl-overwrites","securityContext":{"seLinuxOptions":{"level":"s0","type":"unconfined_t"}}},{"name":"clean-cilium-state","securityContext":{"seLinuxOptions":{"level":"s0","type":"unconfined_t"}}}]}}}}'`
_ = c.MustSSH(controller, patch)
status := "/opt/bin/cilium status --wait --wait-duration 1m"
_ = c.MustSSH(controller, status)
},
},
},
Expand All @@ -73,8 +77,8 @@ var (
testConfig = map[string]map[string]interface{}{
"v1.24.1": map[string]interface{}{
"FlannelVersion": "v0.18.1",
"CiliumVersion": "1.11.5",
"CiliumCLIVersion": "v0.10.7",
"CiliumVersion": "1.12.1",
"CiliumCLIVersion": "v0.12.2",
"CNIVersion": "v1.1.1",
"CRIctlVersion": "v1.24.2",
"ReleaseVersion": "v0.13.0",
Expand All @@ -98,8 +102,8 @@ var (
},
"v1.23.4": map[string]interface{}{
"FlannelVersion": "v0.16.3",
"CiliumVersion": "1.11.2",
"CiliumCLIVersion": "v0.10.2",
"CiliumVersion": "1.12.1",
"CiliumCLIVersion": "v0.12.2",
"CNIVersion": "v1.0.1",
"CRIctlVersion": "v1.22.0",
"ReleaseVersion": "v0.4.0",
Expand All @@ -123,8 +127,8 @@ var (
},
"v1.22.7": map[string]interface{}{
"FlannelVersion": "v0.16.3",
"CiliumVersion": "1.11.2",
"CiliumCLIVersion": "v0.10.2",
"CiliumVersion": "1.12.1",
"CiliumCLIVersion": "v0.12.2",
"CNIVersion": "v1.0.1",
"CRIctlVersion": "v1.22.0",
"ReleaseVersion": "v0.4.0",
Expand Down Expand Up @@ -182,7 +186,7 @@ func init() {
major = 3140
}

if CNI == "flannel" {
if CNI == "flannel" || CNI == "cilium" {
flags = append(flags, register.NoEnableSelinux)
}

Expand Down
1 change: 1 addition & 0 deletions kola/tests/kubeadm/templates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,7 @@ EOF
--config enable-endpoint-routes=true \
--config cluster-pool-ipv4-cidr={{ .PodSubnet }} \
--version={{ .CiliumVersion }} 2>&1 | iconv --from-code utf-8 --to-code ascii//TRANSLIT
kubectl --namespace kube-system patch daemonset/cilium -p '{"spec":{"template":{"spec":{"containers":[{"name":"cilium-agent","securityContext":{"seLinuxOptions":{"level":"s0","type":"unconfined_t"}}}],"initContainers":[{"name":"mount-cgroup","securityContext":{"seLinuxOptions":{"level":"s0","type":"unconfined_t"}}},{"name":"apply-sysctl-overwrites","securityContext":{"seLinuxOptions":{"level":"s0","type":"unconfined_t"}}},{"name":"clean-cilium-state","securityContext":{"seLinuxOptions":{"level":"s0","type":"unconfined_t"}}}]}}}}'
# --wait will wait for status to report success
/opt/bin/cilium status --wait 2>&1 | iconv --from-code utf-8 --to-code ascii//TRANSLIT
{{ end }}
Expand Down
1 change: 1 addition & 0 deletions 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 @@ -91,6 +91,7 @@ EOF
--config enable-endpoint-routes=true \
--config cluster-pool-ipv4-cidr=192.168.0.0/17 \
--version=v0.11.1 2>&1 | iconv --from-code utf-8 --to-code ascii//TRANSLIT
kubectl --namespace kube-system patch daemonset/cilium -p '{"spec":{"template":{"spec":{"containers":[{"name":"cilium-agent","securityContext":{"seLinuxOptions":{"level":"s0","type":"unconfined_t"}}}],"initContainers":[{"name":"mount-cgroup","securityContext":{"seLinuxOptions":{"level":"s0","type":"unconfined_t"}}},{"name":"apply-sysctl-overwrites","securityContext":{"seLinuxOptions":{"level":"s0","type":"unconfined_t"}}},{"name":"clean-cilium-state","securityContext":{"seLinuxOptions":{"level":"s0","type":"unconfined_t"}}}]}}}}'
# --wait will wait for status to report success
/opt/bin/cilium status --wait 2>&1 | iconv --from-code utf-8 --to-code ascii//TRANSLIT

Expand Down