[1.14] operator: propagate CiliumClusterConfig when in kvstore mode #32349
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
maintainer-s-little-helper
bot
added
backport/1.14
|
/test |
giorio94
requested changes
May 6, 2024
There was a problem hiding this comment.
The backport looks reasonable to me, being straightforward and extremely unlikely to introduce regressions.
Could you please just edit the commit message to link the upstream commit for consistency?
[ upstream commit 45174b3c97779a4288b59f6650d4d4b7d6380418 ]
You can also use ./contrib/backporting/cherry-pick 45174b3c9777 to automatically add it while cherry-picking the patch. And also fix the link in the PR description? The correct one is #27109.
|
(i forgot to mention earlier, FYI the trigger phrase on the v1.14 branch is test-backport-1.14) |
hemanthmalla
force-pushed
the
hmalla/op_cluster_config
branch
from
770061d
to
c6949e0
Compare
|
/test-backport-1.14 |
|
@giorio94 Thanks for catching that. Updated the commit and PR description. |
[ upstream commit 45174b3 ] 5e5a26e ("clustermesh: Implement a basic connect-time validation") introduced the CiliumClusterConfig, which is stored in the kvstore by the clustermesh-apiserver at startup time to propagate information about the current cluster (e.g., its cluster ID). The same operation, though, was not performed when cilium is configured in kvstore mode (the clustermesh-apiserver is not enabled in this case). Let's fix this deviation implementing the same logic also in the cilium operator. No capabilities are set in this case, because sync canaries are not supported (and not needed given that the kvstore is expected to leverage persistent storage in this case). Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
hemanthmalla
force-pushed
the
hmalla/op_cluster_config
branch
from
c6949e0
to
ca2c7a5
Compare
|
Rebased to pull in c5ab76b |
|
/test-backport-1.14 |
maintainer-s-little-helper
bot
added
the
ready-to-merge
ldelossa
approved these changes
May 7, 2024
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.
1.14 backport of #27109 to support running
kvstoremeshinkvstoreidentity allocation mode. Currently cluster-config in local kvstore is only set by apiserver component of clustermesh-apiserver. In this config, we don't need to run apiserver component. So, without this commit remote clusters cannot discover cluster-id and will default to using 0 as cluster ID.