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.

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

Upgrade Cilium to v1.15.1 for k8s 1.28 compatibility #18259

Merged
merged 1 commit into from Mar 13, 2024

Conversation

camclay
Copy link
Contributor

@camclay camclay commented Feb 28, 2024

Context


The Cilium version deployed by minikube is incompatible with version 1.28 of Kubernetes and is no longer supported by the Cilium project.

This PR updates Cilium to version 1.15.1, the latest available.

Implementation


Update Kubernetes template in minikube/pkg/cni/cilium.go to version 1.15.1 in the image sections. No significant changes were needed in the template which are breaking at this time.

Testing


Limited testing was done, on a Mac M1, using Docker v4.27.2 and minikube v1.32.0.
❯ ./out/minikube start --cni=cilium
😄  minikube v1.32.0 on Darwin 14.3.1 (arm64)
🆕  Kubernetes 1.28.4 is now available. If you would like to upgrade, specify: --kubernetes-version=v1.28.4
✨  Using the docker driver based on existing profile
❗  docker is currently using the stargz storage driver, setting preload=false
👍  Starting control plane node minikube in cluster minikube
🚜  Pulling base image v0.0.42-1708008208-17936 ...
🏃  Updating the running docker "minikube" container ...
🐳  Preparing Kubernetes v1.28.3 on Docker 24.0.7 ...
🔎  Verifying Kubernetes components...
    ▪ Using image registry.k8s.io/metrics-server/metrics-server:v0.7.0
    ▪ Using image gcr.io/k8s-minikube/storage-provisioner:v5
    ▪ Using image docker.io/kubernetesui/dashboard:v2.7.0
    ▪ Using image docker.io/kubernetesui/metrics-scraper:v1.0.8
💡  Some dashboard features require the metrics-server addon. To enable all features please run:

	minikube addons enable metrics-server

🌟  Enabled addons: storage-provisioner, metrics-server, default-storageclass, dashboard
🏄  Done! kubectl is now configured to use "minikube" cluster and "default" namespace by default
❯ cilium status
    /¯¯\
 /¯¯\__/¯¯\    Cilium:             OK
 \__/¯¯\__/    Operator:           OK
 /¯¯\__/¯¯\    Envoy DaemonSet:    disabled (using embedded mode)
 \__/¯¯\__/    Hubble Relay:       disabled
    \__/       ClusterMesh:        disabled

Deployment             cilium-operator    Desired: 1, Ready: 1/1, Available: 1/1
DaemonSet              cilium             Desired: 1, Ready: 1/1, Available: 1/1
Containers:            cilium             Running: 1
                       cilium-operator    Running: 1
Cluster Pods:          7/7 managed by Cilium
Helm chart version:    
Image versions         cilium             quay.io/cilium/cilium:v1.12.3@sha256:30de50c4dc0a1e1077e9e7917a54d5cab253058b3f779822aec00f5c817ca826: 1
                       cilium-operator    quay.io/cilium/operator-generic:v1.12.3@sha256:816ec1da586139b595eeb31932c61a7c13b07fb4a0255341c0e0f18608e84eff: 1

Note This was heavily based off the earlier commit by @rastaman in #15242

Copy link

linux-foundation-easycla bot commented Feb 28, 2024

CLA Signed

The committers listed above are authorized under a signed CLA.

  • ✅ login: camclay / name: Camille Clayton (540f885)

@k8s-ci-robot k8s-ci-robot added the cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label Feb 28, 2024
@k8s-ci-robot
Copy link
Contributor

Welcome @camclay!

It looks like this is your first PR to kubernetes/minikube 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/minikube has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Feb 28, 2024
@k8s-ci-robot
Copy link
Contributor

Hi @camclay. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Feb 28, 2024
@minikube-bot
Copy link
Collaborator

Can one of the admins verify this patch?

@camclay
Copy link
Contributor Author

camclay commented Feb 28, 2024

I setup the Easy CLA and amended the commit, but please let me know if I need to resubmit this PR. Thanks in advance!

@spowelljr
Copy link
Member

@camclay It looks like the commit you pushed with isn't linked to your GitHub, could you try amending the commit with an email tied to your GitHub?

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Feb 29, 2024
@camclay
Copy link
Contributor Author

camclay commented Feb 29, 2024

@camclay It looks like the commit you pushed with isn't linked to your GitHub, could you try amending the commit with an email tied to your GitHub?

I got this configured! Had my github email set to private, amended and linked now! Thank you!

@spowelljr
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Feb 29, 2024
@minikube-pr-bot
Copy link

kvm2 driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 18259) |
+----------------+----------+---------------------+
| minikube start | 50.3s    | 49.6s               |
| enable ingress | 25.1s    | 26.0s               |
+----------------+----------+---------------------+

Times for minikube start: 48.1s 49.5s 50.5s 53.2s 50.1s
Times for minikube (PR 18259) start: 48.4s 50.0s 49.5s 48.8s 51.1s

Times for minikube ingress: 24.6s 23.0s 24.1s 27.0s 26.7s
Times for minikube (PR 18259) ingress: 28.0s 24.1s 23.2s 28.0s 26.6s

docker driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 18259) |
+----------------+----------+---------------------+
| minikube start | 23.8s    | 22.6s               |
| enable ingress | 22.2s    | 21.3s               |
+----------------+----------+---------------------+

Times for minikube start: 25.3s 24.9s 21.2s 25.2s 22.2s
Times for minikube (PR 18259) start: 22.1s 21.9s 22.5s 21.7s 24.6s

Times for minikube ingress: 20.9s 22.9s 24.8s 20.8s 21.8s
Times for minikube (PR 18259) ingress: 20.8s 22.3s 20.8s 20.8s 21.8s

docker driver with containerd runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 18259) |
+----------------+----------+---------------------+
| minikube start | 22.6s    | 22.1s               |
| enable ingress | 32.1s    | 31.3s               |
+----------------+----------+---------------------+

Times for minikube start: 20.5s 23.5s 24.4s 23.9s 20.5s
Times for minikube (PR 18259) start: 21.8s 21.2s 23.1s 21.0s 23.6s

Times for minikube (PR 18259) ingress: 30.3s 32.3s 31.3s 31.3s 31.3s
Times for minikube ingress: 32.3s 32.3s 31.3s 33.3s 31.3s

@minikube-pr-bot
Copy link

These are the flake rates of all failed tests.

Environment Failed Tests Flake Rate (%)
Docker_Linux_containerd TestFunctional/parallel/ConfigCmd (gopogh) 0.00 (chart)
Docker_macOS TestRunningBinaryUpgrade (gopogh) 0.00 (chart)
Hyper-V_Windows TestIngressAddonLegacy/serial/ValidateIngressAddonActivation (gopogh) 0.00 (chart)
Hyper-V_Windows TestIngressAddonLegacy/serial/ValidateIngressDNSAddonActivation (gopogh) 0.00 (chart)
Hyper-V_Windows TestIngressAddonLegacy/StartLegacyK8sCluster (gopogh) 0.00 (chart)
Hyper-V_Windows TestMountStart/serial/StartWithMountSecond (gopogh) 0.00 (chart)
Hyper-V_Windows TestNetworkPlugins/group/kindnet/Start (gopogh) 0.00 (chart)
Hyper-V_Windows TestNetworkPlugins/group/kubenet/HairPin (gopogh) 0.00 (chart)
Docker_Windows TestNetworkPlugins/group/flannel/Start (gopogh) 0.69 (chart)
KVM_Linux TestIngressAddonLegacy/serial/ValidateIngressAddonActivation (gopogh) 2.45 (chart)
KVM_Linux TestIngressAddonLegacy/serial/ValidateIngressDNSAddonActivation (gopogh) 2.45 (chart)
KVM_Linux TestIngressAddonLegacy/StartLegacyK8sCluster (gopogh) 2.45 (chart)
KVM_Linux TestKubernetesUpgrade (gopogh) 2.45 (chart)
KVM_Linux TestStartStop/group/old-k8s-version/serial/AddonExistsAfterStop (gopogh) 2.45 (chart)
KVM_Linux TestStartStop/group/old-k8s-version/serial/DeployApp (gopogh) 2.45 (chart)
KVM_Linux TestStartStop/group/old-k8s-version/serial/EnableAddonWhileActive (gopogh) 2.45 (chart)
KVM_Linux TestStartStop/group/old-k8s-version/serial/FirstStart (gopogh) 2.45 (chart)
KVM_Linux TestStartStop/group/old-k8s-version/serial/SecondStart (gopogh) 2.45 (chart)
KVM_Linux TestStartStop/group/old-k8s-version/serial/UserAppExistsAfterStop (gopogh) 2.45 (chart)
KVM_Linux_containerd TestIngressAddonLegacy/serial/ValidateIngressAddons (gopogh) 3.64 (chart)
KVM_Linux_containerd TestIngressAddonLegacy/serial/ValidateIngressAddonActivation (gopogh) 4.79 (chart)
KVM_Linux_containerd TestIngressAddonLegacy/serial/ValidateIngressDNSAddonActivation (gopogh) 4.79 (chart)
KVM_Linux_containerd TestIngressAddonLegacy/StartLegacyK8sCluster (gopogh) 4.79 (chart)
KVM_Linux_containerd TestStartStop/group/old-k8s-version/serial/AddonExistsAfterStop (gopogh) 4.79 (chart)
KVM_Linux_containerd TestStartStop/group/old-k8s-version/serial/DeployApp (gopogh) 4.79 (chart)
KVM_Linux_containerd TestStartStop/group/old-k8s-version/serial/EnableAddonWhileActive (gopogh) 4.79 (chart)
KVM_Linux_containerd TestStartStop/group/old-k8s-version/serial/SecondStart (gopogh) 4.79 (chart)
KVM_Linux_containerd TestStartStop/group/old-k8s-version/serial/UserAppExistsAfterStop (gopogh) 4.79 (chart)
KVM_Linux_crio TestIngressAddonLegacy/serial/ValidateIngressAddonActivation (gopogh) 4.82 (chart)
KVM_Linux_crio TestIngressAddonLegacy/serial/ValidateIngressDNSAddonActivation (gopogh) 4.82 (chart)
More tests... Continued...

Too many tests failed - See test logs for more details.

To see the flake rates of all tests by environment, click here.

Copy link
Member

@medyagh medyagh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thank you for this PR @camclay, look forward to see more contributions from you

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: camclay, medyagh

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 13, 2024
@medyagh medyagh merged commit ba9d7cf into kubernetes:master Mar 13, 2024
23 of 42 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants