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

connectivity: Automatically install IP routes on nodes w/o Cilium for from CIDR tests AND get rid of --datapath #1579

Merged
merged 11 commits into from
May 25, 2023

Conversation

brb
Copy link
Member

@brb brb commented May 5, 2023

This PR introduces a few changes:

  1. Moves IP routes (pod CIDR => node on nodes w/o Cilium) installation to the CLI.
  2. Removes --datapath, and introduces --include-unsafe-tests. The formal removal required a few changes to the flow validation and skipping some tests to make it pass on some GHA workflows.

Please review it per commit.

Successful run - cilium/cilium#25510.

@brb brb added the area/CI Continuous Integration testing issue or flake label May 5, 2023
@brb brb temporarily deployed to ci May 5, 2023 13:36 — with GitHub Actions Inactive
@brb brb temporarily deployed to ci May 5, 2023 15:52 — with GitHub Actions Inactive
@brb brb force-pushed the pr/brb/conn-external-detect branch from 4f5c2a8 to 28324be Compare May 5, 2023 16:00
@brb brb temporarily deployed to ci May 5, 2023 16:00 — with GitHub Actions Inactive
@brb brb temporarily deployed to ci May 5, 2023 19:36 — with GitHub Actions Inactive
@brb brb temporarily deployed to ci May 8, 2023 14:31 — with GitHub Actions Inactive
@brb brb force-pushed the pr/brb/conn-external-detect branch from a610468 to efd74a7 Compare May 8, 2023 14:50
@brb brb temporarily deployed to ci May 8, 2023 14:50 — with GitHub Actions Inactive
@brb brb temporarily deployed to ci May 8, 2023 15:39 — with GitHub Actions Inactive
brb added a commit to cilium/cilium that referenced this pull request May 11, 2023
We need to install extneral CIDR routes for the encryption tests, as the
previous ones are deleted by "kind delete cluster".

The boilerplate will go away once
cilium/cilium-cli#1579 has been merged.

Signed-off-by: Martynas Pumputis <[email protected]>
@brb brb force-pushed the pr/brb/conn-external-detect branch from d65f42b to 3cb290c Compare May 15, 2023 14:52
@brb brb temporarily deployed to ci May 15, 2023 14:52 — with GitHub Actions Inactive
@brb brb force-pushed the pr/brb/conn-external-detect branch from 3cb290c to d59a51f Compare May 15, 2023 15:13
@brb brb temporarily deployed to ci May 15, 2023 15:14 — with GitHub Actions Inactive
@brb brb force-pushed the pr/brb/conn-external-detect branch from d59a51f to 907dfb0 Compare May 15, 2023 18:43
@brb brb temporarily deployed to ci May 15, 2023 18:43 — with GitHub Actions Inactive
@brb brb temporarily deployed to ci May 16, 2023 05:50 — with GitHub Actions Inactive
@brb brb force-pushed the pr/brb/conn-external-detect branch from 0d44369 to c25eeb0 Compare May 16, 2023 06:01
@brb brb force-pushed the pr/brb/conn-external-detect branch from c25eeb0 to f7446e4 Compare May 16, 2023 06:02
@brb brb temporarily deployed to ci May 16, 2023 06:02 — with GitHub Actions Inactive
@brb brb force-pushed the pr/brb/conn-external-detect branch from f7446e4 to ccfeae5 Compare May 17, 2023 13:46
@brb brb temporarily deployed to ci May 17, 2023 13:46 — with GitHub Actions Inactive
@brb brb force-pushed the pr/brb/conn-external-detect branch from ccfeae5 to e67f7c6 Compare May 18, 2023 08:35
@brb brb temporarily deployed to ci May 18, 2023 08:35 — with GitHub Actions Inactive
@brb brb changed the title connectivity: Auto detect external CIDRS and auto install podCIDR => host routes connectivity: Automatically install IP routes on nodes w/o Cilium for from CIDR tests AND get rid of --datapath May 18, 2023
@brb brb temporarily deployed to ci May 18, 2023 09:39 — with GitHub Actions Inactive
@brb brb force-pushed the pr/brb/conn-external-detect branch from a648e31 to 8d91077 Compare May 24, 2023 09:54
@brb brb temporarily deployed to ci May 24, 2023 09:54 — with GitHub Actions Inactive
@brb brb force-pushed the pr/brb/conn-external-detect branch from 8d91077 to 2f020a4 Compare May 24, 2023 10:17
@brb brb temporarily deployed to ci May 24, 2023 10:17 — with GitHub Actions Inactive
@brb
Copy link
Member Author

brb commented May 24, 2023

Successful CI run - cilium/cilium#25638. The Go linter failure is a red-herring.

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.

LGTM, thanks!

Last commit could be squashed with the first?

This commit splits the host-netns deamonset into two - one which runs on
nodes which runs Cilium ("host-netns"), and one which runs on non-Cilium
test nodes selected with "--nodes-without-cilium"
("host-netns-non-cilium").

This is required, so that we grant NET_ADMIN only to the latter.

Signed-off-by: Martynas Pumputis <[email protected]>
@brb brb force-pushed the pr/brb/conn-external-detect branch from 2f020a4 to f91c327 Compare May 25, 2023 07:55
@brb brb temporarily deployed to ci May 25, 2023 07:55 — with GitHub Actions Inactive
@brb
Copy link
Member Author

brb commented May 25, 2023

Last commit could be squashed with the first?

I've tried squashing it, but hit many merge conflicts. Anyway, I think having two separate commits gives a good understanding to a reader about our preference for granting permissions in a fine-grained manner.

@brb brb added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label May 25, 2023
@brb
Copy link
Member Author

brb commented May 25, 2023

Got majority of ACKs. All CI has passed. Merging to unblock other PRs.

@brb brb merged commit f99bfcd into main May 25, 2023
@brb brb deleted the pr/brb/conn-external-detect branch May 25, 2023 08:57
brb added a commit to cilium/cilium that referenced this pull request May 26, 2023
This allows us to drop the external-from-cidrs detection, and also drop
the "--datapath" connectivity test, as it was merged into the main
connectivity suite. Both were done in [1].

[1]: cilium/cilium-cli#1579

Signed-off-by: Martynas Pumputis <[email protected]>
brb added a commit to cilium/cilium that referenced this pull request May 26, 2023
[1] has fixed skipping some tests which previously was failing on v1.13.

[1]: cilium/cilium-cli#1579

Signed-off-by: Martynas Pumputis <[email protected]>
brb added a commit to cilium/cilium that referenced this pull request May 30, 2023
This allows us to drop the external-from-cidrs detection, and also drop
the "--datapath" connectivity test, as it was merged into the main
connectivity suite. Both were done in [1].

[1]: cilium/cilium-cli#1579

Signed-off-by: Martynas Pumputis <[email protected]>
brb added a commit to cilium/cilium that referenced this pull request May 30, 2023
[1] has fixed skipping some tests which previously was failing on v1.13.

[1]: cilium/cilium-cli#1579

Signed-off-by: Martynas Pumputis <[email protected]>
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 ready-to-merge This PR has passed all tests and received consensus from code owners to merge.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants