Skip to content

⚠️ Restructure strategy fields #12506

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 8 commits into from
Jul 24, 2025
Merged

⚠️ Restructure strategy fields #12506

merged 8 commits into from
Jul 24, 2025
+2,726 −2,219

Conversation

sbueringer
Copy link
Member

@sbueringer sbueringer commented Jul 21, 2025 •
edited
Loading

Signed-off-by: Stefan Büringer buringerst@vmware.com

What this PR does / why we need it:
Entirely WIP atm, please wait with reviews

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

@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. do-not-merge/needs-area PR is missing an area label labels Jul 21, 2025
@k8s-ci-robot k8s-ci-robot requested review from elmiko and sivchari July 21, 2025 12:10
@k8s-ci-robot k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Jul 21, 2025
@sbueringer sbueringer force-pushed the pr-field-reshuffling-strategy branch 3 times, most recently from b2517cc to f84e6ca Compare July 22, 2025 09:24
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 22, 2025
@sbueringer
Move deletePolicy to deletion.order
0295be4 
Signed-off-by: Stefan Büringer buringerst@vmware.com
@sbueringer
Move maxInFlight
7318a96
@sbueringer
Rename KCP remediationStrategy to remediation
dc9a066 
Signed-off-by: Stefan Büringer buringerst@vmware.com
@sbueringer sbueringer force-pushed the pr-field-reshuffling-strategy branch from a79dfea to 80fe3ae Compare July 22, 2025 11:33
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 22, 2025
@sbueringer sbueringer force-pushed the pr-field-reshuffling-strategy branch 5 times, most recently from 3a97821 to 64cf2b3 Compare July 22, 2025 14:44
@sbueringer
Restructure KCP spec.rollout fields
46d994c 
Signed-off-by: Stefan Büringer buringerst@vmware.com
@sbueringer sbueringer force-pushed the pr-field-reshuffling-strategy branch from 64cf2b3 to 9ad6d09 Compare July 22, 2025 15:02
sbueringer
sbueringer commented Jul 22, 2025
View reviewed changes
@sbueringer
Restructure strategy fields in MD, Cluster and ClusterClass
4ac636d 
Signed-off-by: Stefan Büringer buringerst@vmware.com
@sbueringer sbueringer force-pushed the pr-field-reshuffling-strategy branch from 9ad6d09 to 4ac636d Compare July 22, 2025 15:28
@sbueringer sbueringer added the area/api Issues or PRs related to the APIs label Jul 22, 2025
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/needs-area PR is missing an area label label Jul 22, 2025
@sbueringer sbueringer changed the title [WIP] ⚠️ Restructure strategy fields ⚠️ Restructure strategy fields Jul 22, 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 22, 2025
JoelSpeed
JoelSpeed reviewed Jul 22, 2025
View reviewed changes
fabriziopandini
fabriziopandini reviewed Jul 22, 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.

first part of the review (I will continue tomorrow)

@sbueringer
Copy link
Member Author

@fabriziopandini @JoelSpeed PTAL, all findings should be addressed. Keeping hold, still trying to update the doc later :)

@sbueringer
Copy link
Member Author

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

@JoelSpeed
Copy link
Contributor

Apart from the potential improvement to the time fields to remove the pointer, all looks good to me from an API review perspective

@sbueringer sbueringer mentioned this pull request Jul 23, 2025
Merged
@sbueringer
Copy link
Member Author

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

sbueringer
sbueringer commented Jul 23, 2025
View reviewed changes
@sbueringer sbueringer force-pushed the pr-field-reshuffling-strategy branch from 77c0d83 to 9f1a794 Compare July 24, 2025 10:16
@sbueringer
Copy link
Member Author

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

@fabriziopandini fabriziopandini mentioned this pull request Jul 24, 2025
Merged
fabriziopandini
fabriziopandini reviewed Jul 24, 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.

/lgtm

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

LGTM label has been added.

Git tree hash: 39f0e882262b0057b1f5716e2ab1cc85e79a2fe0

@sbueringer sbueringer added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Jul 24, 2025
@sbueringer
Copy link
Member Author

/hold cancel

Moved documentation to a separate PR (#12521 )

@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 Jul 24, 2025
@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Jul 24, 2025 •
edited
Loading

@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 9f1a794 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.

@sbueringer
Copy link
Member Author

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

Same tests are failing on main after we merged #12516

Will look into it, but has nothing to do with this PR

@k8s-ci-robot
Copy link
Contributor

@sbueringer: Overrode contexts on behalf of sbueringer: pull-cluster-api-e2e-main-gke

In response to this:

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

Same tests are failing on main after we merged #12516

Will look into it, but has nothing to do with this 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.

@fabriziopandini
Copy link
Member

/approve
So we can unblock the last set of PRs, we can eventually iterate if some late comment comes in

@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 24, 2025
@k8s-ci-robot k8s-ci-robot merged commit 12e6357 into kubernetes-sigs:main Jul 24, 2025
20 of 22 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.11 milestone Jul 24, 2025
@sbueringer sbueringer deleted the pr-field-reshuffling-strategy branch July 24, 2025 13:43
@sbueringer sbueringer mentioned this pull request Jul 24, 2025
Open
3 tasks
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

@JoelSpeed JoelSpeed JoelSpeed left review comments

@elmiko elmiko Awaiting requested review from elmiko

@sivchari sivchari Awaiting requested review from sivchari

Assignees

@fabriziopandini fabriziopandini

@JoelSpeed JoelSpeed

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/api Issues or PRs related to the APIs 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. 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 @JoelSpeed @k8s-ci-robot @fabriziopandini