-
Notifications
You must be signed in to change notification settings - Fork 1.4k
🌱 Simplify KCP matchesKubeadmConfig #12813
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
🌱 Simplify KCP matchesKubeadmConfig #12813
Conversation
|
/assign @fabriziopandini |
|
/test pull-cluster-api-e2e-main |
Signed-off-by: Stefan Büringer [email protected]
c069292 to
a7d9e68
Compare
|
/test pull-cluster-api-e2e-main |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Really nice cleanup!
| match, diff, err := matchClusterConfiguration(currentKubeadmConfig, kcp) | ||
| // takes the KubeadmConfigSpec from KCP and applies the transformations required | ||
| // to allow a comparison with the KubeadmConfig referenced from the machine. | ||
| desiredKubeadmConfig := getAdjustedKcpConfig(kcp, currentKubeadmConfig) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What about moving getAdjustedKcpConfig into PrepareKubeadmConfigsForDiff, so we have everything in one func?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would keep it here for now.
We don't need it in the upcoming case where we are going to use PrepareKubeadmConfigsForDiff (right in front of CanUpdateMachine) and I'm going to delete getAdjustedKcpConfig entirely as it will be part of ComputeDesiredKubeadmConfig in the next PR
|
/test pull-cluster-api-apidiff-main |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nice, thanks for the clean up
/lgtm
|
LGTM label has been added. Git tree hash: 9919d94e859412323f7d856b0ab24d21257548e4
|
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: fabriziopandini The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Signed-off-by: Stefan Büringer [email protected]
What this PR does / why we need it:
Which issue(s) this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)format, will close the issue(s) when PR gets merged):Part of #12291