Skip to content

Use connectivity package from cilium/cilium#2355

Merged
michi-covalent merged 1 commit intomainfrom
pr/michi/majestic-ketchup
Apr 5, 2024
Merged

Use connectivity package from cilium/cilium#2355
michi-covalent merged 1 commit intomainfrom
pr/michi/majestic-ketchup

Conversation

@michi-covalent
Copy link
Copy Markdown
Contributor

@michi-covalent michi-covalent commented Mar 1, 2024

Replace the connectivity package with the one from cilium/cilium repo. The main rationale for moving the connectivity package to cilium/cilium repo is to enable Cilium developers to implement new features and add tests for the new features without having to deal with multiple repos. According to @brb, this will drastically boost Cilium developers' productivity, bringing the feature development velocity to the next level. See CFP-25694 1 for additional details.

Renovate is configured to upgrade to cilium/cilium pre-releases 2, so cilium-cli gets synced to the latest cilium/cilium connectivity package from the main branch roughly once every month.

Footnotes

  1. https://github.com/cilium/design-cfps/pull/9

  2. https://github.com/cilium/cilium-cli/pull/2449

@michi-covalent
Copy link
Copy Markdown
Contributor Author

michi-covalent commented Mar 1, 2024

to avoid breaking tests against older cilium versions:

  • run the latest cli tests against all maintained stable branches (e.g. v1.15, v1.14, v1.13) in addition to main.

to avoid breaking cilium-cli:

to further reduce developer pain points:

  • later on we might end up moving more stuff like k8s or sysdump packages. tbd.

@michi-covalent michi-covalent force-pushed the pr/michi/majestic-ketchup branch from 3197889 to dbb60bc Compare March 1, 2024 23:23
@michi-covalent michi-covalent force-pushed the pr/michi/majestic-ketchup branch from dbb60bc to b227c2e Compare March 1, 2024 23:27
@michi-covalent michi-covalent force-pushed the pr/michi/majestic-ketchup branch from d0895f9 to 2ad9f8d Compare March 2, 2024 04:48
@michi-covalent michi-covalent force-pushed the pr/michi/majestic-ketchup branch from 2ad9f8d to 1a35fa2 Compare March 2, 2024 04:52
@michi-covalent michi-covalent force-pushed the pr/michi/majestic-ketchup branch from 0ff7b82 to d4d3dad Compare March 4, 2024 22:28
@michi-covalent michi-covalent force-pushed the pr/michi/majestic-ketchup branch from d4d3dad to c91d0b1 Compare March 5, 2024 00:16
@michi-covalent michi-covalent force-pushed the pr/michi/majestic-ketchup branch from c91d0b1 to 10420eb Compare March 5, 2024 01:29
@michi-covalent michi-covalent force-pushed the pr/michi/majestic-ketchup branch from 10420eb to 3eb87c1 Compare March 5, 2024 01:34
@michi-covalent michi-covalent force-pushed the pr/michi/majestic-ketchup branch from 3eb87c1 to ec9c6d2 Compare March 5, 2024 04:35
@michi-covalent michi-covalent force-pushed the pr/michi/majestic-ketchup branch from ec9c6d2 to 9efd23f Compare March 5, 2024 04:45
@michi-covalent michi-covalent force-pushed the pr/michi/majestic-ketchup branch from 9efd23f to a08dbe1 Compare March 5, 2024 05:06
@michi-covalent michi-covalent force-pushed the pr/michi/majestic-ketchup branch from a08dbe1 to 5d66fbf Compare March 5, 2024 05:08
@michi-covalent michi-covalent force-pushed the pr/michi/majestic-ketchup branch from 4c82905 to ac15d3a Compare March 12, 2024 05:07
@michi-covalent michi-covalent force-pushed the pr/michi/majestic-ketchup branch from ac15d3a to 957ce72 Compare March 12, 2024 23:34
@michi-covalent michi-covalent force-pushed the pr/michi/majestic-ketchup branch from 957ce72 to e790781 Compare March 13, 2024 00:07
@michi-covalent michi-covalent force-pushed the pr/michi/majestic-ketchup branch from e790781 to e14fd6c Compare March 13, 2024 00:15
@michi-covalent michi-covalent force-pushed the pr/michi/majestic-ketchup branch from e14fd6c to 1fd8afa Compare March 14, 2024 00:52
@michi-covalent michi-covalent force-pushed the pr/michi/majestic-ketchup branch from 1fd8afa to a1395c3 Compare March 14, 2024 00:59
@michi-covalent michi-covalent force-pushed the pr/michi/majestic-ketchup branch from a1395c3 to 5db7680 Compare March 14, 2024 01:02
@michi-covalent michi-covalent force-pushed the pr/michi/majestic-ketchup branch from 5db7680 to 4922e7e Compare March 14, 2024 01:17
@michi-covalent michi-covalent force-pushed the pr/michi/majestic-ketchup branch from 4922e7e to b835ff6 Compare March 14, 2024 13:27
@michi-covalent michi-covalent force-pushed the pr/michi/majestic-ketchup branch from b835ff6 to bd43e83 Compare March 14, 2024 13:48
go.mod Outdated
github.com/cilium/charts v0.0.0-20240315160837-a5bec4908d75
github.com/cilium/cilium v1.16.0-pre.0
github.com/cilium/hubble v0.13.2
github.com/cilium/cilium v1.16.0-pre.0.0.20240328232606-9ea9af7d936a
Copy link
Copy Markdown
Contributor Author

@michi-covalent michi-covalent Mar 29, 2024

Choose a reason for hiding this comment

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

@tklauser i'm in a bit of a chicken and egg situation here 🐔🥚. i need the change in api/api.go in cilium/cilium#31077, and cilium/cilium#31077 is the pull request that adds github.com/cilium/cilium/cilium-cli/connectivity package.

one way to deal with it is to:

it doesn't feel very clean, but i can't think of a better way to deal with this. any thought? 💭

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Hm, that's a tricky one. I don't think there's a way around depending on a not-merged version in one or the other repo. I guess it will only be present for a short time frame and won't happen again unless we move other packages from cilium/cilium-cli to cilium/cilium.

Copy link
Copy Markdown
Member

@tklauser tklauser left a comment

Choose a reason for hiding this comment

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

LGTM!

Copy link
Copy Markdown
Member

@sayboras sayboras left a comment

Choose a reason for hiding this comment

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

Looks good to me from vendor team

Replace the connectivity package with the one from cilium/cilium repo.
The main rationale for moving the connectivity package to cilium/cilium
repo is to enable Cilium developers to implement new features and add
tests for the new features without having to deal with multiple repos.
According to @brb, this will drastically boost Cilium developers'
productivity, bringing the feature development velocity to the next
level. See CFP-25694 [^1] for additional details.

Renovate is configured to upgrade to cilium/cilium pre-releases [^2], so
cilium-cli gets synced to the latest cilium/cilium connectivity package
from the main branch roughly once every month.

[^1]: cilium/design-cfps#9
[^2]: #2449

Signed-off-by: Michi Mutsuzaki <[email protected]>
@michi-covalent
Copy link
Copy Markdown
Contributor Author

michi-covalent commented Apr 4, 2024

i boldly assert that this pull request is ready to be merged based on the following three factors:

  • there are 4 approvals without any blocking reviews.
  • it is also approved by ipcache, contributing, and cli teams since tobias is a member of these teams. github didn't remove these teams from the review list because the approval came while the pull request was still in draft.
  • this pull request only refactors the connectivity package without changing the actual test logic, and we've had a discussion regarding this refactoring in great details in CFP-25694. therefore i claim that getting approvals from all the owners of individual test files is a bit of an overkill.

happy merging everybody 🚀🙏

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants