Move github.com/cilium/ipam packages to main repo #25289
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tklauser
added
release-note/misc
|
/test |
tklauser
force-pushed
the
pr/tklauser/merge-cilium-ipam
branch
from
4574364
to
1d06ec9
Compare
|
/test |
tklauser
force-pushed
the
pr/tklauser/merge-cilium-ipam
branch
6 times, most recently
from
2e90303
to
7c2cc13
Compare
|
/test |
tklauser
force-pushed
the
pr/tklauser/merge-cilium-ipam
branch
from
7c2cc13
to
ef38d1d
Compare
|
/test |
tklauser
requested review from
rolinh,
gandro,
squeed,
tommyp1ckles and
christarazi
gandro
approved these changes
May 10, 2023
|
/test-runtime #25291 https://jenkins.cilium.io/job/Cilium-PR-Runtime-net-next/6575/ Job 'Cilium-PR-K8s-1.26-kernel-net-next' failed: Click to show.Test NameFailure OutputJenkins URL: https://jenkins.cilium.io/job/Cilium-PR-K8s-1.26-kernel-net-next/2192/ If it is a flake and a GitHub issue doesn't already exist to track it, comment Then please upload the Jenkins artifacts to that issue. |
|
/test-1.26-net-next |
squeed
approved these changes
May 10, 2023
christarazi
approved these changes
May 10, 2023
tommyp1ckles
approved these changes
May 12, 2023
maintainer-s-little-helper
bot
added
the
ready-to-merge
In order to be able to assign the return value of NewSafeRand to a typed variable or a struct member, the type needs to be exported. This will be needed in a successive commit. Signed-off-by: Tobias Klauser <tobias@cilium.io>
We want to retain the k8s author copyright notice for these files. Signed-off-by: Tobias Klauser <tobias@cilium.io>
Instead of keeping a separate repo for these packages move them to the main cilium repo which makes this easier to maintain and iterate on. The code was originally forked from k8s.io/kubernetes/pkg/registry/core/service and has since been extended and changed to fit Cilium's needs. This is a copy of the github.com/cilium/ipam repo at commit cilium/ipam@fd66eae This corresponds to the version that is currently vendored. Additionally, the test files are copied and unnecessry BUILD files (stemming from upstream k8s) were removed. Some modifications to the lock and rand types used within the packages needed to be made: * Use mutex types from pkg/lock for deadlock detection * Use pkg/rand for concurrency safe PRNG * Change the license/copyright format in file headers to conform to Cilium project requirements. Otherwise linters would complain about the use of the Go stdlib types. Signed-off-by: Tobias Klauser <tobias@cilium.io>
tklauser
force-pushed
the
pr/tklauser/merge-cilium-ipam
branch
from
ef38d1d
to
60a769e
Compare
|
/test |
tklauser
removed
the
ready-to-merge
maintainer-s-little-helper
bot
added
the
ready-to-merge
2 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
First 3 commits are preparatory to update the vendored package, allow use of Cilium's concurrency-safe PRNG type in the new package and allow k8s authors in file header copyright notices.
The fourth commit moves the packages. Quoting the commit message: