Skip to content

Bump cilium to 1.17 for kOps 1.33 #17266

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

Jump to bottom
Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Bump cilium to 1.17 for kOps 1.33 #17266

wants to merge 4 commits into from

Conversation

ameukam
Copy link
Member

@ameukam ameukam commented Feb 19, 2025

Release notes: cilium/cilium#37434

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Feb 19, 2025
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign rifelpet for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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

justinsb
justinsb reviewed Feb 19, 2025
View reviewed changes
pkg/apis/kops/validation/validation.go
if version.Minor != 16 {
allErrs = append(allErrs, field.Invalid(versionFld, v.Version, "Only version 1.16 is supported"))
if version.Minor != 17 {
allErrs = append(allErrs, field.Invalid(versionFld, v.Version, "Only version 1.17 is supported"))
Copy link
Member

Choose a reason for hiding this comment

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

Do we need to hard-deprecate 1.16 for any reason? I guess this is what we were doing before, but it seems quite aggressive...

Copy link
Member Author

Choose a reason for hiding this comment

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

I will guess that we want to support only 1 version per major kOps release ?
@rifelpet or @hakman may know better about this.

Copy link
Member

Choose a reason for hiding this comment

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

Cilium requires an updated template with every release, so we either have N large templates or we update for all releases.

Copy link
Member

Choose a reason for hiding this comment

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

See the header of [k8s-1.16-v1.15.yaml.template]:(https://github.com/kubernetes/kops/blob/master/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.15.yaml.template)

helm template --release-name cilium cilium/cilium \
--version 1.16.2 \
--namespace kube-system \
--values helm-values.yaml

Copy link
Member

Choose a reason for hiding this comment

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

@ameukam did you update the template ^^^?

Copy link
Member Author

Choose a reason for hiding this comment

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

I did a partial update fix the CI but I'm not sure about a full update. the diff is pretty big.

@hakman
Copy link
Member

hakman commented Feb 20, 2025

/retest

@rifelpet
Copy link
Member

From the cilium e2e failure:

W0220 05:18:36.167908    5536 results.go:63] error from apply on apps/v1, Kind=DaemonSet kube-system/cilium: error from apply: error patching object: failed to create typed patch object (kube-system/cilium; apps/v1, Kind=DaemonSet): errors:
  .spec.template.spec.volumes: duplicate entries for key [name="cilium-netns"]
  .spec.template.spec.volumes[name="cilium-netns"].mountPath: field not declared in schema

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 10, 2025
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 10, 2025
@ameukam
Copy link
Member Author

ameukam commented Mar 10, 2025

/retest

1 similar comment
@ameukam
Copy link
Member Author

ameukam commented Mar 11, 2025

/retest

@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Mar 16, 2025
@ameukam
Copy link
Member Author

ameukam commented Mar 16, 2025

/retest

@rifelpet rifelpet mentioned this pull request Mar 20, 2025
Open
@hakman
Copy link
Member

hakman commented Apr 1, 2025

/override tests-e2e-scenarios-bare-metal

@k8s-ci-robot
Copy link
Contributor

@hakman: /override requires failed status contexts, check run or a prowjob name to operate on.
The following unknown contexts/checkruns were given:

  • tests-e2e-scenarios-bare-metal

Only the following failed contexts/checkruns were expected:

  • EasyCLA
  • build-linux-amd64
  • build-linux-arm64
  • build-macos-amd64
  • build-windows-amd64
  • deploy/netlify
  • pull-kops-build
  • pull-kops-e2e-aws-upgrade-k130-ko130-to-klatest-kolatest-many-addons
  • pull-kops-e2e-cni-cilium
  • pull-kops-e2e-cni-cilium-eni
  • pull-kops-e2e-cni-cilium-etcd
  • pull-kops-e2e-cni-cilium-ipv6
  • pull-kops-e2e-gce-cni-cilium
  • pull-kops-e2e-k8s-aws-amazonvpc
  • pull-kops-e2e-k8s-aws-calico
  • pull-kops-e2e-k8s-gce-cilium
  • pull-kops-e2e-k8s-gce-ipalias
  • pull-kops-test
  • pull-kops-verify-boilerplate
  • pull-kops-verify-generated
  • pull-kops-verify-gofmt
  • pull-kops-verify-golangci-lint
  • pull-kops-verify-gomod
  • pull-kops-verify-govet
  • pull-kops-verify-terraform
  • tide
  • verify-amd64
  • verify-arm64

If you are trying to override a checkrun that has a space in it, you must put a double quote on the context.

In response to this:

/override tests-e2e-scenarios-bare-metal

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-sigs/prow repository.

@hakman hakman requested review from rifelpet and hakman and removed request for olemarkus and johngmyers April 1, 2025 10:18
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 5, 2025
ameukam added 2 commits April 16, 2025 20:53
@ameukam
Bump Cilium to 1.17
3c9c99c 
Relase notes:
  https://github.com/cilium/cilium/releases/tag/v1.17.0
  https://github.com/cilium/cilium/releases/tag/v1.17.3

Signed-off-by: Arnaud Meukam <ameukam@gmail.com>
@ameukam
Mount /var/run/netns
9b24260 
This is required to be able to exec into pod
network namespaces by opening `/var/run/netns/<pod-netns>`.

Signed-off-by: Arnaud Meukam <ameukam@gmail.com>
ameukam added 2 commits April 16, 2025 22:21
@ameukam
Generate helm template
024a033 
Ran `helm template --release-name cilium cilium/cilium --version 1.17.3
--namespace kube-system --values helm-values.yaml >
k8s-1.16-v1.15.yaml.template`

Signed-off-by: Arnaud Meukam <ameukam@gmail.com>
@ameukam
./hack/update-expected.sh executed
082faa3 
Signed-off-by: Arnaud Meukam <ameukam@gmail.com>
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 16, 2025
@k8s-ci-robot
Copy link
Contributor

@ameukam: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-kops-e2e-cni-cilium-ipv6 082faa3 link false /test pull-kops-e2e-cni-cilium-ipv6
pull-kops-e2e-cni-cilium-eni 082faa3 link true /test pull-kops-e2e-cni-cilium-eni
pull-kops-e2e-cni-cilium-etcd 082faa3 link true /test pull-kops-e2e-cni-cilium-etcd
pull-kops-e2e-cni-cilium 082faa3 link true /test pull-kops-e2e-cni-cilium
pull-kops-e2e-aws-upgrade-k130-ko130-to-klatest-kolatest-many-addons 082faa3 link false /test pull-kops-e2e-aws-upgrade-k130-ko130-to-klatest-kolatest-many-addons
pull-kops-e2e-gce-cni-cilium 082faa3 link false /test pull-kops-e2e-gce-cni-cilium
pull-kops-e2e-k8s-gce-cilium 082faa3 link true /test pull-kops-e2e-k8s-gce-cilium

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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-sigs/prow repository. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 30, 2025
@k8s-ci-robot
Copy link
Contributor

PR needs rebase.

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-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@justinsb justinsb

@rifelpet rifelpet

@hakman hakman

Assignees
No one assigned
Labels
area/addons area/api area/documentation cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ameukam @k8s-ci-robot @hakman @rifelpet @justinsb