Skip to content

⚠️ Implement v1beta2 contract in CAPD #12409

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 12 commits into from
Jun 30, 2025
Merged

⚠️ Implement v1beta2 contract in CAPD #12409

merged 12 commits into from
Jun 30, 2025
+1,197 −377

Conversation

sivchari
Copy link
Member

What this PR does / why we need it:

Part of #11947

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

@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 labels Jun 26, 2025
@k8s-ci-robot k8s-ci-robot requested review from elmiko and enxebre June 26, 2025 07:01
@k8s-ci-robot k8s-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Jun 26, 2025
@sivchari sivchari changed the title ⚠️ Implement v2contract ⚠️ Add initialization status and failure domain to Machine and Cluster status to satisfy v2contract Jun 26, 2025
@sivchari
Copy link
Member Author

/cc @sbueringer @fabriziopandini

@sivchari sivchari force-pushed the implement-v2contract branch from 01e2bd6 to de41284 Compare June 26, 2025 10:17
fabriziopandini
fabriziopandini reviewed Jun 26, 2025
View reviewed changes
@sivchari
Copy link
Member Author

I addressed all reviews. Please review again.

@sivchari sivchari force-pushed the implement-v2contract branch from d5a68dc to aa12d33 Compare June 26, 2025 13:12
@sivchari
Copy link
Member Author

/retest

@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jun 27, 2025
@sivchari
Copy link
Member Author

/area provider/infrastructure-docker

@k8s-ci-robot k8s-ci-robot added area/provider/infrastructure-docker Issues or PRs related to the docker infrastructure provider and removed do-not-merge/needs-area PR is missing an area label labels Jun 27, 2025
@sbueringer
Copy link
Member

/test pull-cluster-api-e2e-main

@fabriziopandini
Copy link
Member

fabriziopandini commented Jun 27, 2025 •
edited
Loading

I'm ok for the implementation, but I assume that we have to invest a little bit on investigating the test failures + let's have a look on the entire test suite
/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-latestk8s-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-33-1-34-main

sbueringer
sbueringer reviewed Jun 27, 2025
View reviewed changes
Copy link
Member

@sbueringer sbueringer left a comment

Choose a reason for hiding this comment

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

Mostly nits, not sure why e2e is failing

@sbueringer
Copy link
Member

@sivchari Please trigger all the tests (#12409 (comment)) once the findings are resolved

@sivchari sivchari force-pushed the implement-v2contract branch 5 times, most recently from ea13eb1 to af7e8c7 Compare June 29, 2025 13:19
@sivchari
Copy link
Member Author

/retest

sivchari added 11 commits June 30, 2025 12:35
@sivchari
add status initialization to DockerMachine and DevMachine
ac673e1 
Signed-off-by: sivchari <[email protected]>
@sivchari
implement v1beta2 contract
7bc66a6 
Signed-off-by: sivchari <[email protected]>
@sivchari
fix review findings
4ef872d 
Signed-off-by: sivchari <[email protected]>
@sivchari
use clusterv1.FailureDomain to satisfy v1beta2 contract
269a3ca 
Signed-off-by: sivchari <[email protected]>
@sivchari
fix print column
17d4f8a 
Signed-off-by: sivchari <[email protected]>
@sivchari
rename Foo to Dev
7d2273e 
Signed-off-by: sivchari <[email protected]>
@sivchari
fix review findings
50c729e 
Signed-off-by: sivchari <[email protected]>
@sivchari
add validation to check whether the failure domains are sorted by name
97fe1fb 
Signed-off-by: sivchari <[email protected]>
@sivchari
sort failure domains by name when converting
c0a68d5 
Signed-off-by: sivchari <[email protected]>
@sivchari
add manually conversion
a88f062 
Signed-off-by: sivchari <[email protected]>
@sivchari
fix panic
d0ec7be 
Signed-off-by: sivchari <[email protected]>
@sivchari sivchari force-pushed the implement-v2contract branch from eccae78 to d0ec7be Compare June 30, 2025 03:35
@sivchari
Copy link
Member Author

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-latestk8s-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-33-1-34-main

@sivchari
Copy link
Member Author

/cc @sbueringer @fabriziopandini

sbueringer
sbueringer reviewed Jun 30, 2025
View reviewed changes
@sbueringer
Copy link
Member

@sivchari Thx! Last minor findings from my side

@sivchari
fix review findings
6a8d821 
Signed-off-by: sivchari <[email protected]>
@sbueringer
Copy link
Member

Thank you very much!

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-latestk8s-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-33-1-34-main

/lgtm

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

LGTM label has been added.

Git tree hash: db1ddbc448d5311a65203a9cec2bccdcb2ea6908

@sbueringer sbueringer changed the title ⚠️ Add initialization status and failure domain to Machine and Cluster status to satisfy v2contract ⚠️ Implement v1beta2 contract in CAPD Jun 30, 2025
@fabriziopandini
Copy link
Member

/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 Jun 30, 2025
@fabriziopandini fabriziopandini mentioned this pull request Jun 30, 2025
Open
71 tasks
@k8s-ci-robot k8s-ci-robot merged commit 4ce7960 into kubernetes-sigs:main Jun 30, 2025
29 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.11 milestone Jun 30, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sbueringer sbueringer sbueringer left review comments

@elmiko elmiko Awaiting requested review from elmiko

@enxebre enxebre Awaiting requested review from enxebre

@fabriziopandini fabriziopandini Awaiting requested review from fabriziopandini

Assignees

@sbueringer sbueringer

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/provider/infrastructure-docker Issues or PRs related to the docker infrastructure provider 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
Milestone
v1.11
Development

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