Skip to content

⚠️ Remove more defaulting from KubeadmConfig/KubeadmConfigTemplate/KCP/KCPTemplate #12495

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
Jul 17, 2025
Merged

⚠️ Remove more defaulting from KubeadmConfig/KubeadmConfigTemplate/KCP/KCPTemplate #12495

merged 1 commit into from
Jul 17, 2025
+231 −246

Conversation

sbueringer
Copy link
Member

@sbueringer sbueringer commented Jul 15, 2025 •
edited
Loading

What this PR does / why we need it:
This PR removes some more redundant defaulting to reduce noise in objects. I also added some handling to avoid triggering rollouts after CAPI upgrade.

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 #10852

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jul 15, 2025
@k8s-ci-robot k8s-ci-robot requested a review from chrischdi July 15, 2025 18:23
@k8s-ci-robot k8s-ci-robot added the do-not-merge/needs-area PR is missing an area label label Jul 15, 2025
@k8s-ci-robot k8s-ci-robot requested a review from elmiko July 15, 2025 18:23
@k8s-ci-robot k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Jul 15, 2025
@sbueringer sbueringer added area/provider/control-plane-kubeadm Issues or PRs related to KCP area/provider/bootstrap-kubeadm Issues or PRs related to CAPBK labels Jul 15, 2025
@k8s-ci-robot k8s-ci-robot removed do-not-merge/needs-area PR is missing an area label labels Jul 15, 2025
@sbueringer sbueringer force-pushed the pr-remove-more-defaulting branch 2 times, most recently from 7898539 to e35938f Compare July 15, 2025 18:54
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-main

1 similar comment
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-main

@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-main-gke

@sbueringer sbueringer force-pushed the pr-remove-more-defaulting branch from 9cbccfe to dc687bb Compare July 16, 2025 07:29
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-main-gke

@sbueringer sbueringer force-pushed the pr-remove-more-defaulting branch from dc687bb to eb289e8 Compare July 16, 2025 07:57
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-main-gke

@sbueringer sbueringer force-pushed the pr-remove-more-defaulting branch from eb289e8 to e4deee8 Compare July 16, 2025 08:27
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-main-gke

@sbueringer sbueringer force-pushed the pr-remove-more-defaulting branch from e4deee8 to 227fc7a Compare July 16, 2025 11:59
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jul 16, 2025
@sbueringer sbueringer changed the title [WIP] ⚠️ Remove more defaulting from KubeadmConfig/KubeadmConfigTemplate/KCP/KCPTemplate ⚠️ Remove more defaulting from KubeadmConfig/KubeadmConfigTemplate/KCP/KCPTemplate Jul 16, 2025
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 16, 2025
@sbueringer
Copy link
Member Author

/assign @fabriziopandini @JoelSpeed

@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-main-gke

fabriziopandini
fabriziopandini reviewed Jul 16, 2025
View reviewed changes
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.

Thanks for this PR!

@sbueringer sbueringer added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Jul 16, 2025
@sbueringer sbueringer force-pushed the pr-remove-more-defaulting branch from 227fc7a to 56f5567 Compare July 16, 2025 17:00
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-main-gke

@k8s-ci-robot
Copy link
Contributor

@sbueringer: The following tests 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-e2e-main 9cbccfe link true /test pull-cluster-api-e2e-main
pull-cluster-api-apidiff-main 56f5567 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

fabriziopandini commented Jul 17, 2025 •
edited
Loading

/lgtm
/approve

(pull-cluster-api-e2e-main-gke os green so we can ignore ipv6 failure on pull-cluster-api-e2e-main)

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

LGTM label has been added.

Git tree hash: d0aec91404e2324caeffd0d1427fd6d54a25c0ce

@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 Jul 17, 2025
@k8s-ci-robot k8s-ci-robot merged commit 2576709 into kubernetes-sigs:main Jul 17, 2025
18 of 19 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.11 milestone Jul 17, 2025
@sbueringer sbueringer deleted the pr-remove-more-defaulting branch July 17, 2025 11:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fabriziopandini fabriziopandini fabriziopandini left review comments

@chrischdi chrischdi Awaiting requested review from chrischdi

@elmiko elmiko Awaiting requested review from elmiko

Assignees

@fabriziopandini fabriziopandini

@JoelSpeed JoelSpeed

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/provider/bootstrap-kubeadm Issues or PRs related to CAPBK 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/L Denotes a PR that changes 100-499 lines, ignoring generated files. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.
Projects
None yet
Milestone
v1.11
Development

Successfully merging this pull request may close these issues.
4 participants
@sbueringer @k8s-ci-robot @fabriziopandini @JoelSpeed