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

test: Fix and unquarantine Skip conntrack test #25038

Merged
merged 3 commits into from
Apr 21, 2023

Conversation

pchaigno
Copy link
Member

@pchaigno pchaigno commented Apr 21, 2023

First commit removes the flaky behavior, second improve error messages in case of failure, third unquarantines.

Fixes: #22019.

The 'Skip conntrack for pod traffic' test currently downloads the
conntrack package at runtime to be able to flush and list Linux's
conntrack entries. This sometimes fail because of connectivity issues to
the package repositories.

Instead, we've now included the conntrack package in the log-gatherer
image. We can use those pods to run conntrack commands instead of using
the Cilium agent pods.

Fixes: 496ce42 ("iptables: add support for NOTRACK rules for pod-to-pod traffic")
Signed-off-by: Paul Chaignon <paul@cilium.io>
If we check res.WasSuccessful() instead of res, then ginkgo won't print
the error message in case the command wasn't successful.

Signed-off-by: Paul Chaignon <paul@cilium.io>
A previous commit fixed the test, we can now unquarantine it.

Signed-off-by: Paul Chaignon <paul@cilium.io>
@pchaigno pchaigno added sig/datapath Impacts bpf/ or low-level forwarding details, including map management and monitor messages. release-note/ci This PR makes changes to the CI. labels Apr 21, 2023
@pchaigno pchaigno requested a review from jibi April 21, 2023 12:04
@pchaigno pchaigno requested review from a team as code owners April 21, 2023 12:04
@pchaigno
Copy link
Member Author

/test-vagrant

Copy link
Member

@nbusseneau nbusseneau left a comment

Choose a reason for hiding this comment

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

Instead, we've now included the conntrack package in the log-gatherer
image.

Nice!

Copy link
Member

@christarazi christarazi left a comment

Choose a reason for hiding this comment

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

🚀

@christarazi christarazi added the area/CI Continuous Integration testing issue or flake label Apr 21, 2023
@pchaigno pchaigno merged commit 750beac into cilium:main Apr 21, 2023
41 checks passed
@pchaigno pchaigno deleted the fix-conntrack-pkg-flake branch April 21, 2023 17:16
@pchaigno pchaigno added needs-backport/1.11 needs-backport/1.13 This PR / issue needs backporting to the v1.13 branch needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch and removed needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch labels Jul 20, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from main in 1.13.3 Jul 20, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from main in 1.12.10 Jul 20, 2023
@pchaigno
Copy link
Member Author

Marking for backports since it affects v1.11.

@nbusseneau nbusseneau mentioned this pull request Jul 24, 2023
4 tasks
@nbusseneau nbusseneau mentioned this pull request Jul 24, 2023
5 tasks
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from main to Backport pending to v1.12 in 1.12.10 Jul 24, 2023
@nbusseneau nbusseneau mentioned this pull request Jul 24, 2023
8 tasks
@nbusseneau nbusseneau added backport-pending/1.13 The backport for Cilium 1.13.x for this PR is in progress. and removed needs-backport/1.13 This PR / issue needs backporting to the v1.13 branch labels Jul 24, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from main to Backport pending to v1.13 in 1.13.3 Jul 24, 2023
@gentoo-root gentoo-root added backport-done/1.11 The backport for Cilium 1.11.x for this PR is done. backport-done/1.13 The backport for Cilium 1.13.x for this PR is done. and removed backport-pending/1.11 backport-pending/1.13 The backport for Cilium 1.13.x for this PR is in progress. labels Jul 26, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.13 to Backport done to v1.13 in 1.13.3 Jul 26, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.12 to Needs backport from main in 1.12.10 Jul 26, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.12 to Needs backport from main in 1.12.10 Jul 26, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from main to Backport pending to v1.12 in 1.12.10 Jul 26, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from main to Backport pending to v1.12 in 1.12.10 Jul 26, 2023
@julianwiedmann julianwiedmann added backport-done/1.12 The backport for Cilium 1.12.x for this PR is done. and removed backport-pending/1.12 labels Jul 29, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.12 to Backport done to v1.12 in 1.12.10 Jul 29, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.12 to Backport done to v1.12 in 1.12.10 Jul 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/CI Continuous Integration testing issue or flake backport-done/1.11 The backport for Cilium 1.11.x for this PR is done. backport-done/1.12 The backport for Cilium 1.12.x for this PR is done. backport-done/1.13 The backport for Cilium 1.13.x for this PR is done. release-note/ci This PR makes changes to the CI. sig/datapath Impacts bpf/ or low-level forwarding details, including map management and monitor messages.
Projects
No open projects
1.12.10
Backport done to v1.12
1.13.3
Backport done to v1.13
Development

Successfully merging this pull request may close these issues.

CI: K8sDatapathConfig Iptables Skip conntrack for pod traffic
6 participants