Add SSA merge strategy to container Cluster's nodeConfig to avoid fights over ownership. #487
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
JonathanO
requested review from
ulucinar,
sergenyalcin and
turkenf
as code owners
…hts over ownership. Signed-off-by: Jonathan Oddy <jonathan@woaf.net>
JonathanO
force-pushed
the
jono-fix-cluster-nodeconfig-merge
branch
from
593b8d7
to
8eba414
Compare
ulucinar
approved these changes
Mar 21, 2024
There was a problem hiding this comment.
Thanks @JonathanO, lgtm. Checked the Terraform schema of node_config and I agree with your analysis that there's no natural indexing set for the type and hence, we need to inject a new index key to the type. As a side note, could you please consider using signed commits in the future?
@sergenyalcin, @turkenf, let's aim to release these changes in v1.0.2.
|
Successfully created backport PR #494 for |
|
Successfully created backport PR #495 for |
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.
Description of your changes
The Cluster nodeConfig is a singleton list containing the node config for the pool. By default lists are treated as atomic by server-side-apply, which means only one manager can own them. nodeConfig contains fields resolved by the provider (service account) so if you also try to patch some of the other fields with a composition function then the provider and composition repeatedly delete each others fields.
The ListTypeMap strategy treats the list elements similarly to a granular map, which is what we need, but it requires a key by which to identify each element of the list. There is no such key for nodeConfig, but since it's a singleton we can inject a default using a non-existent name with a fixed value.
I have:
make reviewableto ensure this PR is ready for review.backport release-x.ylabels to auto-backport this PR if necessary.How has this code been tested
Running in kind against GKE