iptables: Don't fail on missing ip6tables when InstallIptRules=false#43940
iptables: Don't fail on missing ip6tables when InstallIptRules=false#43940joestringer merged 1 commit intocilium:mainfrom
Conversation
This comment was marked as outdated.
This comment was marked as outdated.
|
Thanks, fix makes logical sense but just for awareness there are a few specific cases where Cilium currently requires ip(6)tables, tracked by #12879. You will need to rebase against main and force-push (no merge commits please). For more info see the development guide (but note it's OK if you can't change labels, that's normal until you're a member of the org). |
a1d6a12 to
a870a9a
Compare
|
/test |
This comment was marked as outdated.
This comment was marked as outdated.
|
@javiercardona-work would you mind dropping the merge commit, rebase against main and force-push to update? Then we can run the tests & mark to merge. |
InstallIptRules sets whether Cilium should install any iptables in general. When disabled, Cilium should not require ip6tables kernel modules to be present. The current code fails startup if IPv6 is enabled but ip6tables is unavailable, even when iptables rules are not being installed. This fix allows Cilium to start in environments where ip6tables is not available but iptables rule installation is disabled via configuration. Signed-off-by: Javier Cardona <jcardona@meta.com>
a6b9926 to
4687bfc
Compare
|
/test |
|
@joestringer Can someone help me understand the failing test? I do not think it is related to this change. |
|
Sure. I'll demonstrate the steps below that you can follow along for future reference. Ginkgo test results present in their own slightly different way from the other failures, but the general GitHub UI navigation stuff should be a common pattern for understanding failures. This should be pretty similar to the CI Triage guide for developers in the docs. Triage
Check for existing failures
Is this codepath exercised?
|
|
We can follow up on the failure in #44082, it doesn't need to block this PR. I've retriggered the failing test. |
InstallIptRules sets whether Cilium should install any iptables in general. When disabled, Cilium should not require ip6tables kernel modules to be present. The current code fails startup if IPv6 is enabled but ip6tables is unavailable, even when iptables rules are not being installed.
This fix allows Cilium to start in environments where ip6tables is not available but iptables rule installation is disabled via configuration.
Please ensure your pull request adheres to the following guidelines:
-SKIPPED: Testing this would require setting up proper mocks for logger and both iptables interfaces. Many similar conditions in this codebase are not unit-tested directly but are covered by integration tests.
description and a
Fixes: #XXXline if the commit addresses a particularGitHub issue.
Fixes: <commit-id>tag, thenplease add the commit author[s] as reviewer[s] to this issue.
Fixes: #issue-number