Fix external workloads not working with non-default ClusterID #29378
Conversation
This file contains hidden or 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
|
/ci-external-workloads |
1 similar comment
|
/ci-external-workloads |
23e762c ("node: add extra validation") introduced extra validation logic executed when unmarshalling node objects retrieved from the kvstore, ensuring in particular that the ClusterID is in the expected range and non-zero (unless the local ClusterID is zero). Yet, this validation broke the external workloads support, if the ClusterID is set to a non-zero value. Indeed, the RegisterNode type used in this case is just a wrapper for the Node one, and reuses the same unmarshalling logic. Given that the RegisterNode object is initially created configuring the name only, it causes an unmarshalling failure when processed by the clustermesh-apiserver, due to the ClusterID being zero (only if that of the cluster is different from zero). To fix this issue, let's override the Unmarshal function to skip the validation logic for the external workloads type, as used differently. Another possibility could be to explicitly configure the ClusterID; yet this would be trickier to backport to v1.14, as historically the ClusterID was not configured for external workloads agents, and inferred at runtime from that of the cluster it connected to. Fixes: 23e762c ("node: add extra validation") Fixes: #29355 Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
a385d6d to
6313088
Compare
|
/test |
2 tasks
YutaroHayakawa
approved these changes
Nov 28, 2023
youngnick
approved these changes
Nov 28, 2023
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.
23e762c ("node: add extra validation") introduced extra validation logic executed when unmarshalling node objects retrieved from the kvstore, ensuring in particular that the ClusterID is in the expected range and non-zero (unless the local ClusterID is zero).
Yet, this validation broke the external workloads support, if the ClusterID is set to a non-zero value. Indeed, the RegisterNode type used in this case is just a wrapper for the Node one, and reuses the same unmarshalling logic. Given that the RegisterNode object is initially created configuring the name only, it causes an unmarshalling failure when processed by the clustermesh-apiserver, due to the ClusterID being zero (only if that of the cluster is different from zero).
To fix this issue, let's override the Unmarshal function to skip the validation logic for the external workloads type, as used differently. Another possibility could be to explicitly configure the ClusterID; yet this would be trickier to backport to v1.14, as historically the ClusterID was not configured for external workloads agents, and inferred at runtime from that of the cluster it connected to.
Link to successful CI run, with non-default ClusterID: https://github.com/cilium/cilium/actions/runs/7002550345
Fixes #29355