fix(cni-plugin): append inbound skip ports instead of replacing #518
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Alex Leong <[email protected]>
Signed-off-by: Alex Leong <[email protected]>
alpeb
approved these changes
May 12, 2025
| @@ -25,6 +25,9 @@ kubectl apply -f https://k3d.io/v5.1.0/usage/advanced/calico.yaml | |||
| kubectl --namespace=kube-system wait --for=condition=available --timeout=120s \ | |||
| deploy/calico-kube-controllers | |||
|
|
|||
| # Install gateway API | |||
| kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.2.1/experimental-install.yaml | |||
|
a pendatic question, but should this be i'm not strongly attached to either side of this choice, but want to raise the question for consideration. |
|
@cratelyn I agree that this is a grey area but I lean toward not marking it as breaking because
|
cratelyn
approved these changes
May 12, 2025
makes sense to me 🙇♀️ thanks! |
sdickhoven
pushed a commit
to sdickhoven/linkerd2-proxy-init
that referenced
this pull request
Jun 11, 2025
…erd#518) Fixes linkerd/linkerd2#13976 When the Linkerd CNI-plugin acts on a pod with a `config.linkerd.io/skip-inbound-ports` annotation, it replaces the inbound skip ports that the CNI-plugin was configured with instead of adding to them. The CNI-plugin is configured with the Linkerd proxy's admin and tap ports as skip inbound ports. Therefore, on any pod with the `config.linkerd.io/skip-inbound-ports` annotation, the admin and tap ports will no longer be skipped by the iptables redirect rules, making these proxy ports inaccessible and causing tap and promethus scraping to no longer function. Instead of replacing, we append the ports specified in `config.linkerd.io/skip-inbound-ports` to the inbound skip ports. This allows the admin and tap ports to continue to skip iptables redirection and reach the proxy as desired. This matches the behavior of the linkerd-init container: https://github.com/linkerd/linkerd2/blob/main/charts/partials/templates/_proxy-init.tpl#L25 Tested manually on k3d with Calico and validating that tap works as expected on workloads with `config.linkerd.io/skip-inbound-ports` configured. Due to the architecture of the cni-plugin executable, it is not well set up to be tested automatically without further refactoring so we omit automated tests here. Signed-off-by: Alex Leong <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes linkerd/linkerd2#13976
When the Linkerd CNI-plugin acts on a pod with a
config.linkerd.io/skip-inbound-portsannotation, it replaces the inbound skip ports that the CNI-plugin was configured with instead of adding to them. The CNI-plugin is configured with the Linkerd proxy's admin and tap ports as skip inbound ports. Therefore, on any pod with theconfig.linkerd.io/skip-inbound-portsannotation, the admin and tap ports will no longer be skipped by the iptables redirect rules, making these proxy ports inaccessible and causing tap and promethus scraping to no longer function.Instead of replacing, we append the ports specified in
config.linkerd.io/skip-inbound-portsto the inbound skip ports. This allows the admin and tap ports to continue to skip iptables redirection and reach the proxy as desired.This matches the behavior of the linkerd-init container: https://github.com/linkerd/linkerd2/blob/main/charts/partials/templates/_proxy-init.tpl#L25
Tested manually on k3d with Calico and validating that tap works as expected on workloads with
config.linkerd.io/skip-inbound-portsconfigured. Due to the architecture of the cni-plugin executable, it is not well set up to be tested automatically without further refactoring so we omit automated tests here.