k8s: Pick up github.com/cilium/cilium v1.16.1 #2935
Closed
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
michi-covalent
added
the
release-note/misc
michi-covalent
force-pushed
the
pr/michi/bump-cilium
branch
3 times, most recently
from
7233e91
to
d26962e
Compare
This new version of Cilium updates k8s.io/code-generator dependency, and generate-groups.sh is no longer supported [^1]. Update pkg/k8s/Makefile to use kube_codegen.sh. One could only assume that this migration is successful since it's generating identical code. k8s-code-gen.sh is copied from cilium/cilium [^3] and modified for Tetragon. See apiextensions docs [^2] regarding x-kubernetes-list-type field in CRDs. [^1]: kubernetes/code-generator@2e5be31 [^2]: https://pkg.go.dev/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions [^3]: https://github.com/cilium/cilium/blob/main/contrib/scripts/k8s-code-gen.sh Signed-off-by: Michi Mutsuzaki <[email protected]>
michi-covalent
force-pushed
the
pr/michi/bump-cilium
branch
from
d26962e
to
89087fc
Compare
|
oh no I already did this work, merged it, reversed it, and retried again recently, hope it didn't take you too much time. This should work now thanks to some fixes I did to controller-tools: #2911. I need to rebase soonish. |
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.
This new version of Cilium updates k8s.io/code-generator dependency, and generate-groups.sh is no longer supported 1. Update pkg/k8s/Makefile to use kube_codegen.sh. One could only assume that this migration is successful since it's generating identical code. k8s-code-gen.sh is copied from cilium/cilium 2 and modified for Tetragon.
See apiextensions docs 3 regarding x-kubernetes-list-type field in CRDs.
Footnotes
https://github.com/kubernetes/code-generator/commit/2e5be312636d3c77fb42ba37cedd4707968608a0 ↩
https://github.com/cilium/cilium/blob/main/contrib/scripts/k8s-code-gen.sh ↩
https://pkg.go.dev/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions ↩