Skip to content

Conversation

@sbueringer
Copy link
Member

@sbueringer sbueringer commented Oct 1, 2025

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

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Oct 1, 2025
@k8s-ci-robot k8s-ci-robot added do-not-merge/needs-area PR is missing an area label size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Oct 1, 2025
@sbueringer sbueringer added the area/provider/control-plane-kubeadm Issues or PRs related to KCP label Oct 1, 2025
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/needs-area PR is missing an area label label Oct 1, 2025
@sbueringer
Copy link
Member Author

/assign @fabriziopandini

@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-main

@sbueringer sbueringer force-pushed the pr-filter-refactoring branch from c069292 to a7d9e68 Compare October 1, 2025 14:50
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-main

Copy link
Member

@fabriziopandini fabriziopandini left a 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)
Copy link
Member

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?

Copy link
Member Author

@sbueringer sbueringer Oct 1, 2025

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

@sbueringer
Copy link
Member Author

/test pull-cluster-api-apidiff-main

Copy link
Contributor

@alexander-demicev alexander-demicev left a 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

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 2, 2025
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 9919d94e859412323f7d856b0ab24d21257548e4

@fabriziopandini
Copy link
Member

/lgtm
/approve

@k8s-ci-robot
Copy link
Contributor

[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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 2, 2025
@k8s-ci-robot k8s-ci-robot merged commit 4e6c8f3 into kubernetes-sigs:main Oct 2, 2025
19 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.12 milestone Oct 2, 2025
@sbueringer sbueringer deleted the pr-filter-refactoring branch October 2, 2025 11:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. area/provider/control-plane-kubeadm Issues or PRs related to KCP cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants