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

Improvements for kube-proxy detection and replacement #1162

Merged
merged 1 commit into from
Nov 10, 2022

Conversation

ksankeerth
Copy link
Contributor

The current implementation tries to replace the kube-proxy for k3s and doesn't honor the value set for kube-proxy replacement by users. This PR fixes those issues.

Fixes: #1004
Signed-off-by: shankeerthan-kasilingam [email protected]

@ksankeerth ksankeerth requested a review from a team as a code owner October 18, 2022 03:17
@ksankeerth ksankeerth requested a review from ldelossa October 18, 2022 03:17
@ksankeerth ksankeerth temporarily deployed to ci October 18, 2022 03:17 Inactive
@ksankeerth ksankeerth force-pushed the dev-1004-improvement branch from 053bb05 to f007db2 Compare October 18, 2022 04:15
@ksankeerth ksankeerth temporarily deployed to ci October 18, 2022 04:15 Inactive
@ksankeerth ksankeerth force-pushed the dev-1004-improvement branch from f007db2 to 93d7c8c Compare October 19, 2022 02:18
@ksankeerth ksankeerth temporarily deployed to ci October 19, 2022 02:18 Inactive
@brb
Copy link
Member

brb commented Oct 25, 2022

@ksankeerth Thanks for the fix! Do you plan to add the k3s detection in a separate PR?

@ksankeerth
Copy link
Contributor Author

@ksankeerth Thanks for the fix! Do you plan to add the k3s detection in a separate PR?

I think we can use k.flavor.Kind detect k3s cluster instead of annotations.

https://github.com/cilium/cilium-cli/pull/1162/files#diff-70c8da281ad8db17039130d2e7ad09aa2fc7db3f6d44217e6db0764bef731fffR178

Copy link
Member

@tklauser tklauser left a comment

Choose a reason for hiding this comment

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

Thanks

@tklauser
Copy link
Member

tklauser commented Nov 9, 2022

@ksankeerth It looks like this branch picked up a merge conflict. Could you please rebase on top of latest master branch?

The current implementation tries to replace  the kube-proxy for k3s and doesn't honor the value set for kube-proxy replacement by users. This PR fixes those issues.

Fixes: cilium#1004
Signed-off-by: shankeerthan-kasilingam <[email protected]>
@ksankeerth ksankeerth force-pushed the dev-1004-improvement branch from 93d7c8c to 57d80c8 Compare November 9, 2022 16:35
@ksankeerth ksankeerth temporarily deployed to ci November 9, 2022 16:35 Inactive
@ksankeerth
Copy link
Contributor Author

@ksankeerth It looks like this branch picked up a merge conflict. Could you please rebase on top of latest master branch?

Thanks for the review. Rebased.

One CI checks seems to be failed. I'll look into it.

@tklauser
Copy link
Member

tklauser commented Nov 9, 2022

@ksankeerth It looks like this branch picked up a merge conflict. Could you please rebase on top of latest master branch?

Thanks for the review. Rebased.

One CI checks seems to be failed. I'll look into it.

Thanks. The failing CI check looks like a known flake. I've re-triggered the test to verify.

@tklauser
Copy link
Member

Thanks for your contribution @ksankeerth!

@tklauser tklauser merged commit d12595e into cilium:master Nov 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Enable kube-proxy replacement if no kube-proxy is detected in a cluster
3 participants