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

feat: add support for Cilium 1.14 #10684

Merged
merged 4 commits into from
Jan 8, 2024

Conversation

rl0nergan
Copy link
Contributor

What type of PR is this?

Uncomment only one /kind <> line, hit enter to put that in a new line, and remove leading whitespaces from that line:

/kind api-change
/kind bug
/kind cleanup
/kind design
/kind documentation
/kind failing-test
/kind feature
/kind flake

What this PR does / why we need it:
Adds support for Cilium 1.14+ for clusters running k8s v1.27+
Which issue(s) this PR fixes:

Fixes #10465

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

Adds support for deploying clusters with cilium 1.14+

@k8s-ci-robot k8s-ci-robot added the kind/feature Categorizes issue or PR as related to a new feature. label Dec 1, 2023
Copy link

linux-foundation-easycla bot commented Dec 1, 2023

CLA Signed

The committers listed above are authorized under a signed CLA.

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

Welcome @rl0nergan!

It looks like this is your first PR to kubernetes-sigs/kubespray 🎉. 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-sigs/kubespray 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
Copy link
Contributor

Hi @rl0nergan. Thanks for your PR.

I'm waiting for a kubernetes-sigs 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 needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Dec 1, 2023
@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 Dec 1, 2023
@yankay
Copy link
Member

yankay commented Dec 4, 2023

/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 Dec 4, 2023
@rl0nergan
Copy link
Contributor Author

thanks @yankay. Looks like all required tests passed. Is there anything else needed from me? If not, can this be approved and merged please?

@yankay
Copy link
Member

yankay commented Dec 7, 2023

Thanks @rl0nergan

Hi @cyclinder , would you please help to review it :-)

@cyclinder
Copy link
Contributor

Hi @cyclinder , would you please help to review it :-)

Sure, I'll take a look at it today.

@pbromb
Copy link

pbromb commented Dec 28, 2023

Thanks @rl0nergan, in my cluster on bare metal, everything works after upgrading to 1.14

@yankay
Copy link
Member

yankay commented Dec 28, 2023

Thanks @rl0nergan,
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 28, 2023
@rl0nergan
Copy link
Contributor Author

hey @yankay, can I get an approval here when you have a chance?

@pbromb
Copy link

pbromb commented Jan 5, 2024

@rl0nergan, the upgrade from 1.13 to 1.14 went through successfully, but the installation of the new node from 1.14 failed, the configuration in /etc/cni/net.d/ was not created. As the cni-install.sh script was removed in version 1.14
it requires additional configuration to initialize the file https://github.com/cilium/cilium/blob/v1.14.0/install/kubernetes/cilium/templates/cilium-configmap.yaml#L778

  # Tell the agent to generate and write a CNI configuration file
  write-cni-conf-when-ready: {{ .Values.cni.hostConfDirMountPath }}/05-cilium.conflist
  cni-exclusive: {{ .Values.cni.exclusive | quote }}
  cni-log-file: {{ .Values.cni.logFile | quote }}

@yankay
Copy link
Member

yankay commented Jan 8, 2024

@rl0nergan, the upgrade from 1.13 to 1.14 went through successfully, but the installation of the new node from 1.14 failed, the configuration in /etc/cni/net.d/ was not created. As the cni-install.sh script was removed in version 1.14 it requires additional configuration to initialize the file https://github.com/cilium/cilium/blob/v1.14.0/install/kubernetes/cilium/templates/cilium-configmap.yaml#L778

  # Tell the agent to generate and write a CNI configuration file
  write-cni-conf-when-ready: {{ .Values.cni.hostConfDirMountPath }}/05-cilium.conflist
  cni-exclusive: {{ .Values.cni.exclusive | quote }}
  cni-log-file: {{ .Values.cni.logFile | quote }}

Thanks @pbromb @rl0nergan

/approve
to this PR.

And the cilium_version at https://github.com/kubernetes-sigs/kubespray/blob/master/roles/kubespray-defaults/defaults/main/download.yml#L120 can be changed later.
So that the CI of v1.14 can be triggered . And if the issue is confirmed as bug , we can fix it in another PR :-)

Best Regards

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cyclinder, rl0nergan, yankay

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 Jan 8, 2024
@k8s-ci-robot k8s-ci-robot merged commit eda7ea5 into kubernetes-sigs:master Jan 8, 2024
63 checks passed
ledroide pushed a commit to ledroide/kubespray that referenced this pull request Jan 9, 2024
* update cilium configmap template for new routing mode and tunnel-protocol options
Ryan Lonergan [email protected]

* add rbac for new cilium crd in 1.14
Ryan Lonergan [email protected]

* add conditional for cni-install.sh that's no longer included in cilium 1.14
Ryan Lonergan [email protected]

* Update roles/network_plugin/cilium/templates/cilium/ds.yml.j2

Co-authored-by: Cyclinder <[email protected]>

---------

Co-authored-by: Cyclinder <[email protected]>
@yankay yankay mentioned this pull request Jan 12, 2024
@manicole
Copy link

manicole commented Feb 9, 2024

@rl0nergan, the upgrade from 1.13 to 1.14 went through successfully, but the installation of the new node from 1.14 failed, the configuration in /etc/cni/net.d/ was not created. As the cni-install.sh script was removed in version 1.14 it requires additional configuration to initialize the file https://github.com/cilium/cilium/blob/v1.14.0/install/kubernetes/cilium/templates/cilium-configmap.yaml#L778

  # Tell the agent to generate and write a CNI configuration file
  write-cni-conf-when-ready: {{ .Values.cni.hostConfDirMountPath }}/05-cilium.conflist
  cni-exclusive: {{ .Values.cni.exclusive | quote }}
  cni-log-file: {{ .Values.cni.logFile | quote }}

Thanks @pbromb @rl0nergan

/approve to this PR.

And the cilium_version at https://github.com/kubernetes-sigs/kubespray/blob/master/roles/kubespray-defaults/defaults/main/download.yml#L120 can be changed later. So that the CI of v1.14 can be triggered . And if the issue is confirmed as bug , we can fix it in another PR :-)

Best Regards

Hello, referenced as a bug by #10887 @yankay ! Could someone please create the PR ? Many thanks

pedro-peter pushed a commit to pedro-peter/kubespray that referenced this pull request May 8, 2024
* update cilium configmap template for new routing mode and tunnel-protocol options
Ryan Lonergan [email protected]

* add rbac for new cilium crd in 1.14
Ryan Lonergan [email protected]

* add conditional for cni-install.sh that's no longer included in cilium 1.14
Ryan Lonergan [email protected]

* Update roles/network_plugin/cilium/templates/cilium/ds.yml.j2

Co-authored-by: Cyclinder <[email protected]>

---------

Co-authored-by: Cyclinder <[email protected]>
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. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cilium 1.14
6 participants