helm: almost always try to delete aws iptables #28697
Merged
Conversation
This file contains 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
maintainer-s-little-helper
bot
added
the
dont-merge/needs-release-note-label
|
/test |
nebril
added
the
release-note/minor
maintainer-s-little-helper
bot
removed
the
dont-merge/needs-release-note-label
nebril
force-pushed
the
pr/nebril/always-delete-aws-iptables
branch
from
9eabe18
to
e915824
Compare
|
/test |
squeed
approved these changes
Oct 20, 2023
nebril
added
the
needs-backport/1.14
joamaki
approved these changes
Oct 23, 2023
nebril
added
dont-merge/blocked
We recently introduced AWS-CONNMARK-CHAIN iptables rules deletion, but didn't add them to an if statement guarding actual deletion. Signed-off-by: Maciej Kwiek <maciej@isovalent.com>
This change causes Cilium DaemonSet postStart hook to always delete AWS iptable rules unless `cni.chainingMode` is set to `aws-cni`. This will result in the postStart hook being a noop in all non-AWS deployments. Unfortunately there is no way for helm chart to know whether it is running on AWS not in ENI mode. This approach will make sure that we are deleting AWS-specific iptables rules that cause issues while not requiring us to introduce new configuration flags for users. Signed-off-by: Maciej Kwiek <maciej@isovalent.com>
nebril
force-pushed
the
pr/nebril/always-delete-aws-iptables
branch
from
e915824
to
74632a5
Compare
|
/test |
|
All required checks passed, marking as ready to merge |
nebril
added
the
ready-to-merge
pippolo84
added
backport-pending/1.14
jibi
added
backport-done/1.14
maintainer-s-little-helper
bot
moved this from Needs backport from main
to Backport done to v1.14
in 1.14.4
giorio94
added a commit
to cilium/cilium-cli
that referenced
this pull request
Jan 30, 2024
…low" This reverts commit bbebbfa. Let's revert the flush stale AWS-CNI iptables rules workaround, as this operation is now automatically handled by Cilium [1,2]. Since bumping the Cilium version used in the EKS workflows to one which includes all fixes (v1.14.6), this workaround has also started failing, as the stale rules attempted to be removed are no longer present. [1]: cilium/cilium#28697 [2]: cilium/cilium#29448
giorio94
added a commit
to cilium/cilium-cli
that referenced
this pull request
Jan 30, 2024
…low" This reverts commit bbebbfa. Let's revert the flush stale AWS-CNI iptables rules workaround, as this operation is now automatically handled by Cilium [1,2]. Since bumping the Cilium version used in the EKS workflows to one which includes all fixes (v1.14.6), this workaround has also started failing, as the stale rules attempted to be removed are no longer present. [1]: cilium/cilium#28697 [2]: cilium/cilium#29448 Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
michi-covalent
pushed a commit
to cilium/cilium-cli
that referenced
this pull request
Jan 30, 2024
…low" This reverts commit bbebbfa. Let's revert the flush stale AWS-CNI iptables rules workaround, as this operation is now automatically handled by Cilium [1,2]. Since bumping the Cilium version used in the EKS workflows to one which includes all fixes (v1.14.6), this workaround has also started failing, as the stale rules attempted to be removed are no longer present. [1]: cilium/cilium#28697 [2]: cilium/cilium#29448 Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
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: #25804
This change causes Cilium DaemonSet postStart hook to always delete AWS
iptable rules unless
cni.chainingModeis set toaws-cni.This will result in the postStart hook being a noop in all non-AWS
deployments. Unfortunately there is no way for helm chart to know
whether it is running on AWS not in ENI mode.
This approach will make sure that we are deleting AWS-specific iptables
rules that cause issues while not requiring us to introduce new
configuration flags for users.
The PR also includes a change in poststart script that makes sure that we delete proper rules.
Credit for figuring out additional scenarios in which we need to delete these rules goes to @squeed and @rabbagliettiandrea