Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make cilium clustemesh status compatible with external kvstore #2199

Merged
merged 3 commits into from
Jan 9, 2024

Conversation

giorio94
Copy link
Member

@giorio94 giorio94 commented Dec 19, 2023

The clustermesh-apiserver cannot be used in combination with Cilium running in kvstore mode when the identity allocation mode is kvstore. In this case, remote clusters shall be configured to directly connect to the local etcd cluster. Let's extend the clustermesh status command to additionally cover this setup, ignoring the validation of clustermesh-apiserver specific resources.

Additionally, let's improve the reporting in case cilium clustermesh status --wait times out, and fix an issue causing it to always report an error if the clustermesh secret also includes the configuration for the local cluster.

Let's return the last retrieved status also when the --wait timeout
expires, so that users can know which nodes are not connected.

Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
c4e47b4 ("clustermesh status: validate expected number of
clusters") extended the clustermesh status command to retrieve
the list of expected clusters to connect to from the clustermesh
secret, to prevent flakiness caused by a change not having yet
been observed by the agents. Yet, a possible entry concerning
the local cluster is not ignored (as instead agents do), causing
the check to always fail in that case. Let's fix it.

Fixes: c4e47b4 ("clustermesh status: validate expected number of clusters")
Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
The clustermesh-apiserver cannot be used in combination with Cilium
running in kvstore mode when the identity allocation mode is kvstore.
In this case, remote clusters shall be configured to directly connect
to the local etcd cluster. Let's extend the `clustermesh status`
command to additionally cover this setup, ignoring the validation of
clustermesh-apiserver specific resources.

Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jan 4, 2024
@tklauser tklauser merged commit 5f2a3dd into cilium:main Jan 9, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge This PR has passed all tests and received consensus from code owners to merge.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants