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

Fixing cilium routingMode parameters in helm configuration #9401

Open
wants to merge 4 commits into
base: main
Choose a base branch
from

Conversation

parlakisik
Copy link
Contributor

@parlakisik parlakisik commented Mar 11, 2025

Issue #, if available:

*Description of changes: The routingMode parameter name injecting differently "routing-mode" This cause the wrong cilium configuration deployment.

With 1.15 , cilium also require ipv4NativeRoutingCIDR or ipv6NativeRoutingCIDR parameters if routingMode is set to native

*Testing (if applicable): Vsphere deployment is tested and two unit tests are added

*Documentation added/planned (if applicable): Cilium documentation updated

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

@eks-distro-bot
Copy link
Collaborator

Hi @parlakisik. Thanks for your PR.

I'm waiting for a aws 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.

@eks-distro-bot eks-distro-bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 11, 2025
Copy link

codecov bot commented Mar 11, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 69.46%. Comparing base (73cd679) to head (2c52920).
Report is 2 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #9401   +/-   ##
=======================================
  Coverage   69.46%   69.46%           
=======================================
  Files         672      672           
  Lines       49360    49364    +4     
=======================================
+ Hits        34286    34290    +4     
  Misses      13288    13288           
  Partials     1786     1786           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@@ -190,6 +192,7 @@ spec:
cniConfig:
cilium:
routingMode: "direct"
ipv4-native-routing-cidr: 192.168.0.0/16
Copy link
Member

Choose a reason for hiding this comment

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

Now I understood this change, but if this is the case, shouldn't we have validation to ensure that this is specified when routingMode is set to direct? Or if it's not set, autoDirectNodeRoutes is set to true, which is what this should mention right?

Also, I believe we might be making the same mistake again as it should be the following:

Suggested change
ipv4-native-routing-cidr: 192.168.0.0/16
ipv4NativeRoutingCIDR: 192.168.0.0/16

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yeah quick copy paste brighs some issues

@sp1999
Copy link
Member

sp1999 commented Mar 12, 2025

/ok-to-test


This field can be set as follows:
The `ipv4NativeRoutingCIDR` is required to set the CIDR in which native routing can be performed.
Copy link
Member

Choose a reason for hiding this comment

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

It's only ipv4 and not either that or ipv6?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

we are not supporting ipv6 yet

} else {
delete(val, "tunnelProtocol")

if spec.Cluster.Spec.ClusterNetwork.CNIConfig.Cilium.IPv4NativeRoutingCIDR != "" {
Copy link
Member

Choose a reason for hiding this comment

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

This check is technically redundant then right? But doesn't hurt to check here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes after verification check , this become redundant. but it is good verify it here.

The routingMode parameter name injecting differently "routing-mode"
This cause the wrong cilium configuration deployment.

With 1.15 , cilium also require ipv4NativeRoutingCIDR or
ipv6NativeRoutingCIDR parameters if routingMode is set to native
@sp1999
Copy link
Member

sp1999 commented Mar 13, 2025

/cherry-pick release-0.22

@eks-distro-pr-bot
Copy link
Contributor

@sp1999: once the present PR merges, I will cherry-pick it on top of release-0.22 in a new PR and assign it to you.

In response to this:

/cherry-pick release-0.22

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.

@aws aws deleted a comment from eks-distro-pr-bot Mar 13, 2025
@vivek-koppuru
Copy link
Member

/approve

@eks-distro-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vivek-koppuru

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved area/docs Documentation documentation lgtm ok-to-test size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants