Skip to content
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.

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

🌱 Remove Kubeadm upstream v1beta1 types #9345

Merged

Conversation

killianmuldoon
Copy link
Contributor

@killianmuldoon killianmuldoon commented Aug 31, 2023

Signed-off-by: killianmuldoon [email protected]

Remove Kubeadm v1beta1 types from the CAPI codebase.

According to the [Kubeadm docs] "kubeadm v1.22.x and newer no longer support v1beta1 and older APIs, but can be used to migrate v1beta2 to v1beta3". CAPI no longer supportes v1.22 management clusters, and will not support v1.22 workload clusters with the release of CAPI v1.6.0.

Part of #8038

@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 Aug 31, 2023
@k8s-ci-robot k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Aug 31, 2023
Copy link
Contributor Author

@killianmuldoon killianmuldoon left a comment

Choose a reason for hiding this comment

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

/area provider/bootstrap-kubeadm

@k8s-ci-robot k8s-ci-robot added area/provider/bootstrap-kubeadm Issues or PRs related to CAPBK and removed do-not-merge/needs-area PR is missing an area label labels Aug 31, 2023
@killianmuldoon
Copy link
Contributor Author

This PR contains #8997

I'll come back to it once that PR has been merged.

@killianmuldoon killianmuldoon force-pushed the pr-remove-kubeadm-v1beta1 branch 3 times, most recently from e02eeb0 to 82cdae3 Compare August 31, 2023 18:19
@sbueringer
Copy link
Member

sbueringer commented Sep 1, 2023

-2,5k loc would be nice

@killianmuldoon killianmuldoon force-pushed the pr-remove-kubeadm-v1beta1 branch from 82cdae3 to ddbd9f0 Compare September 1, 2023 11:35
@killianmuldoon killianmuldoon changed the title [WIP] 🌱 Remove Kubeadm upstream v1beta1 types 🌱 Remove Kubeadm upstream v1beta1 types Sep 1, 2023
@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 Sep 1, 2023
@killianmuldoon killianmuldoon force-pushed the pr-remove-kubeadm-v1beta1 branch from ddbd9f0 to 6a9aa07 Compare September 1, 2023 11:53
@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Sep 1, 2023

@killianmuldoon: 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 6a9aa07 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/test-infra repository. I understand the commands that are listed here.

@killianmuldoon
Copy link
Contributor Author

With this change CAPBK will fail hard if a Cluster of v1.15.0 or older is used - I wonder if we should reject this at the webhook level.

Copy link
Member

@chrischdi chrischdi 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 1, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: b57ef52bbf7465281fe7104391d0740919da10e4

@sbueringer
Copy link
Member

sbueringer commented Sep 1, 2023

With this change CAPBK will fail hard if a Cluster of v1.15.0 or older is used - I wonder if we should reject this at the webhook level.

I think this is something for the related issue around version validation across CAPI that is open since forever.
Although I'm fine to add this to the current PR if we can add this to the webhook in a relatively straightforward way

@sbueringer
Copy link
Member

nit: v1.15 itself would work

@killianmuldoon
Copy link
Contributor Author

Agreed - I hope nobody's trying to use current CAPI with v1.14.0 and it would probably fail pretty hard in other cases anyway.

Cross-linking the other issue: #7010

@sbueringer
Copy link
Member

Agreed - I hope nobody's trying to use current CAPI with v1.14.0 and it would probably fail pretty hard in other cases anyway.

Cross-linking the other issue: #7010

Yup. We already have the same problem with 1.12 today 😂

@sbueringer
Copy link
Member

/lgtm
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

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 Sep 1, 2023
@k8s-ci-robot k8s-ci-robot merged commit 404f2be into kubernetes-sigs:main Sep 1, 2023
@k8s-ci-robot k8s-ci-robot added this to the v1.6 milestone Sep 1, 2023
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/bootstrap-kubeadm Issues or PRs related to CAPBK 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