Skip to content

✨ KCP: compare ClusterConfiguration via KubeadmConfig instead of annotation on Machine #12758

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Sep 12, 2025
Merged

✨ KCP: compare ClusterConfiguration via KubeadmConfig instead of annotation on Machine #12758

merged 1 commit into from
Sep 12, 2025

Conversation

@sbueringer
Copy link
Member

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 cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-area PR is missing an area label size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Sep 11, 2025
@sbueringer sbueringer mentioned this pull request Sep 11, 2025
Open
66 tasks
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-main

@sbueringer sbueringer added the area/provider/control-plane-kubeadm Issues or PRs related to KCP label Sep 11, 2025
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/needs-area PR is missing an area label label Sep 11, 2025
alexander-demicev
alexander-demicev approved these changes Sep 11, 2025
View reviewed changes
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.

/lgtm

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

LGTM label has been added.

Git tree hash: 1bf63c6975d35a9ea454469d31e1cb8d27e66712

@sbueringer sbueringer force-pushed the pr-simplify-kcp-rollout branch from 7d79997 to 41afb5f Compare September 11, 2025 17:33
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 11, 2025
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-main

Had to fix an issue

sbueringer
sbueringer commented Sep 11, 2025
View reviewed changes
controlplane/kubeadm/internal/filters.go
machineClusterConfig = &bootstrapv1.ClusterConfiguration{}
// Default feature gates like in initializeControlPlane / scaleUpControlPlane.
// Note: Changes in feature gates can still trigger rollouts.
// TODO(in-place) refactor this area so the desired KubeadmConfig is not computed in multiple places independently.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Next PR, otherwise this PR blows up

@sbueringer sbueringer force-pushed the pr-simplify-kcp-rollout branch from 41afb5f to 34339f5 Compare September 12, 2025 05:29
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-main

@sbueringer sbueringer force-pushed the pr-simplify-kcp-rollout branch from 34339f5 to c6285dc Compare September 12, 2025 08:05
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-main

@fabriziopandini
Copy link
Member

Nice cleanup, great to see some tech debt going away from KCP!

For sake of documentation, the commit that made this possible is 494b8b1, and it is already in all the supported releases

/lgtm
/approve
(pending CI)

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

LGTM label has been added.

Git tree hash: c577a8778b22fddbf3c873aba426a795ad096b03

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 12, 2025
@sbueringer
Copy link
Member Author

/hold

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 12, 2025
@sbueringer
KCP: compare ClusterConfiguration via KubeadmConfig instead of
82d1066 
annotation on Machine

Signed-off-by: Stefan Büringer [email protected]
@sbueringer sbueringer force-pushed the pr-simplify-kcp-rollout branch from c6285dc to 82d1066 Compare September 12, 2025 10:28
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 12, 2025
@sbueringer
Copy link
Member Author

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 12, 2025
@k8s-ci-robot
Copy link
Contributor

@sbueringer: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-cluster-api-apidiff-main 82d1066 link false /test pull-cluster-api-apidiff-main

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@fabriziopandini
Copy link
Member

/lgtm
/approve

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

LGTM label has been added.

Git tree hash: 63931e17d8401492b285629c1511e66ed0ce911a

@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 merged commit 3257651 into kubernetes-sigs:main Sep 12, 2025
17 of 18 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.12 milestone Sep 12, 2025
@sbueringer sbueringer deleted the pr-simplify-kcp-rollout branch September 12, 2025 12:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@elmiko elmiko Awaiting requested review from elmiko

@g-gaston g-gaston Awaiting requested review from g-gaston

@alexander-demicev alexander-demicev Awaiting requested review from alexander-demicev

@fabriziopandini fabriziopandini Awaiting requested review from fabriziopandini

Assignees

@fabriziopandini fabriziopandini

@alexander-demicev alexander-demicev

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/XL Denotes a PR that changes 500-999 lines, ignoring generated files.

Projects

None yet

Milestone

v1.12

Development

Successfully merging this pull request may close these issues.

4 participants

@sbueringer @k8s-ci-robot @fabriziopandini @alexander-demicev