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 v1alpha2 adoption logic from KCP #8328

Merged

Conversation

killianmuldoon
Copy link
Contributor

Remove adoption logic for v1alpha2 from the KCP controller. There is currently no direct support for upgrades from v1alpha2 to v1beta1. This code is designed to support that use case so it should be removed.

Clusters which are reconciled by 0.3.X / 0.4.X controllers before updating to v1beta1 will already have this ownerReference removed.

Fixes https://github.com/kubernetes-sigs/cluster-api/pull/8256/files#r1141658906

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Mar 21, 2023
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 21, 2023
@sbueringer
Copy link
Member

lgtm pending linter fix

@killianmuldoon killianmuldoon force-pushed the remove-v1alpha2-adoption branch from ee169bd to 3ce5e63 Compare March 21, 2023 19:13
@sbueringer
Copy link
Member

/lgtm
/assign @fabriziopandini

@killianmuldoon do we want to / have to cherry-pick this PR?

I assume it's just a cleanup and not necessary to get the upcoming ownerRef e2e test green as it's just removing dead code.

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

LGTM label has been added.

Git tree hash: 7dbcc9dd9d0896486d9b0fedd7cd1c6c52635f68

@killianmuldoon
Copy link
Contributor Author

@killianmuldoon do we want to / have to cherry-pick this PR?

No need to cherry-pick IMO. As you said this is a cleanup - nothing to do with any of our current ownerRef tests.

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 22, 2023
@killianmuldoon killianmuldoon force-pushed the remove-v1alpha2-adoption branch from 3ce5e63 to 22ad6f3 Compare March 23, 2023 08:48
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 23, 2023
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 23, 2023
@sbueringer
Copy link
Member

/lgtm

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

LGTM label has been added.

Git tree hash: 7c288458be2c008fcee90860a4adbcaa6aff6eb7

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.

nice cleanup
/approve
/lgtm

@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 Apr 6, 2023
@k8s-ci-robot k8s-ci-robot merged commit e9a588f into kubernetes-sigs:main Apr 6, 2023
@k8s-ci-robot k8s-ci-robot added this to the v1.5 milestone Apr 6, 2023
@johannesfrey
Copy link
Contributor

/area provider/control-plane-kubeadm

@k8s-ci-robot k8s-ci-robot added the area/provider/control-plane-kubeadm Issues or PRs related to KCP label Jun 16, 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/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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants