Use connectivity package from cilium/cilium#2355
Conversation
to avoid breaking tests against older cilium versions:
to avoid breaking cilium-cli:
to further reduce developer pain points:
|
3197889 to
dbb60bc
Compare
dbb60bc to
b227c2e
Compare
d0895f9 to
2ad9f8d
Compare
2ad9f8d to
1a35fa2
Compare
0ff7b82 to
d4d3dad
Compare
d4d3dad to
c91d0b1
Compare
c91d0b1 to
10420eb
Compare
10420eb to
3eb87c1
Compare
3eb87c1 to
ec9c6d2
Compare
ec9c6d2 to
9efd23f
Compare
9efd23f to
a08dbe1
Compare
a08dbe1 to
5d66fbf
Compare
4c82905 to
ac15d3a
Compare
ac15d3a to
957ce72
Compare
957ce72 to
e790781
Compare
e790781 to
e14fd6c
Compare
e14fd6c to
1fd8afa
Compare
1fd8afa to
a1395c3
Compare
a1395c3 to
5db7680
Compare
5db7680 to
4922e7e
Compare
4922e7e to
b835ff6
Compare
b835ff6 to
bd43e83
Compare
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 |
There was a problem hiding this comment.
@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:
- merge this pull request, although it depends on
github.com/cilium/ciliumversion that hasn't been merged to main. - update Move the connectivity package from cilium-cli cilium#31077 to vendor
github.com/cilium/cilium-climain branch to pick up the newapi/api.go. - once Move the connectivity package from cilium-cli cilium#31077 gets merged, update this line to pick up the latest
github.com/cilium/ciliumfrom the main branch.
it doesn't feel very clean, but i can't think of a better way to deal with this. any thought? 💭
There was a problem hiding this comment.
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.
sayboras
left a comment
There was a problem hiding this comment.
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]>
|
i boldly assert that this pull request is ready to be merged based on the following three factors:
happy merging everybody 🚀🙏 |
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
https://github.com/cilium/design-cfps/pull/9 ↩
https://github.com/cilium/cilium-cli/pull/2449 ↩