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.

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

🐛 Delete legacy finalizer, fix setting ownerRef for VSphereClusterIdentity #1486

Merged
merged 1 commit into from
Mar 28, 2022
Merged

🐛 Delete legacy finalizer, fix setting ownerRef for VSphereClusterIdentity #1486

merged 1 commit into from
Mar 28, 2022

Conversation

aartij17
Copy link
Contributor

What this PR does / why we need it:
This PR does this following -

  • Check if the older VSphereClusterIdentity is present and delete it during the reconcileDelete phase. This is to make sure that clusters upgraded from v1alpha3 to v1alpha4/v1beta1 can be deleted once the finalizers are removed
  • Check only the group and kind(and not the version) while setting ownerRef on VSphereClusterIdentity
  • Remove explicit secret deletion from VSphereClusterReconciler (this already happens during the delete reconcile loop of VSphereClusterIdentity)

Which issue(s) this PR fixes:
Fixes #1482

Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.

Release note:

NONE

@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 17, 2022
@aartij17 aartij17 marked this pull request as draft March 17, 2022 23:24
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 17, 2022
@aartij17
Copy link
Contributor Author

/test

@k8s-ci-robot
Copy link
Contributor

@aartij17: The /test command needs one or more targets.
The following commands are available to trigger required jobs:

  • /test pull-cluster-api-provider-vsphere-e2e
  • /test pull-cluster-api-provider-vsphere-integration-test
  • /test pull-cluster-api-provider-vsphere-test
  • /test pull-cluster-api-provider-vsphere-verify-crds
  • /test pull-cluster-api-provider-vsphere-verify-lint
  • /test pull-cluster-api-provider-vsphere-verify-markdown
  • /test pull-cluster-api-provider-vsphere-verify-shell

Use /test all to run the following jobs that were automatically triggered:

  • pull-cluster-api-provider-vsphere-e2e
  • pull-cluster-api-provider-vsphere-integration-test
  • pull-cluster-api-provider-vsphere-test
  • pull-cluster-api-provider-vsphere-verify-crds
  • pull-cluster-api-provider-vsphere-verify-lint

In response to this:

/test

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.

@aartij17
Copy link
Contributor Author

/test pull-cluster-api-provider-vsphere-e2e
/test pull-cluster-api-provider-vsphere-integration-test

@aartij17 aartij17 force-pushed the secret-deletion-fix branch 2 times, most recently from d2717b0 to 974d780 Compare March 23, 2022 17:00
@aartij17 aartij17 marked this pull request as ready for review March 23, 2022 18:08
@aartij17 aartij17 changed the title [WIP] 🐛 Delete legacy finalizer, fix setting ownerRef for VSphereClusterIdentity 🐛 Delete legacy finalizer, fix setting ownerRef for VSphereClusterIdentity Mar 23, 2022
@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 Mar 23, 2022
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 23, 2022
@aartij17 aartij17 force-pushed the secret-deletion-fix branch 5 times, most recently from a2b9c50 to 4f64d25 Compare March 24, 2022 19:11
@aartij17
Copy link
Contributor Author

/test all

@aartij17
Copy link
Contributor Author

/test pull-cluster-api-provider-vsphere-e2e

@aartij17 aartij17 force-pushed the secret-deletion-fix branch 2 times, most recently from 9f31caf to 169bcc9 Compare March 24, 2022 20:38
@aartij17
Copy link
Contributor Author

/test pull-cluster-api-provider-vsphere-verify-lint

@aartij17 aartij17 force-pushed the secret-deletion-fix branch 3 times, most recently from 1c806e4 to 8b08a88 Compare March 24, 2022 21:58
@aartij17
Copy link
Contributor Author

/test pull-cluster-api-provider-vsphere-e2e

@aartij17 aartij17 force-pushed the secret-deletion-fix branch 2 times, most recently from fd048e4 to 5ebb1ac Compare March 24, 2022 23:10
@aartij17
Copy link
Contributor Author

/test pull-cluster-api-provider-vsphere-e2e

@aartij17
Copy link
Contributor Author

/test pull-cluster-api-provider-vsphere-test

@aartij17 aartij17 force-pushed the secret-deletion-fix branch 6 times, most recently from 9e5f50e to 4138984 Compare March 25, 2022 17:32
@aartij17
Copy link
Contributor Author

/test all

yastij
yastij reviewed Mar 28, 2022
View reviewed changes
Copy link
Member

@yastij yastij left a comment

Choose a reason for hiding this comment

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

/approve

controllers/vspherecluster_reconciler.go Outdated Show resolved Hide resolved
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: yastij

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 Mar 28, 2022
@aartij17
delete legacy finalizer
30258f0 
add integration tests
@yastij
Copy link
Member

yastij commented Mar 28, 2022

/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 28, 2022
@yastij
Copy link
Member

yastij commented Mar 28, 2022

/retest

@k8s-ci-robot k8s-ci-robot merged commit 0ea6579 into kubernetes-sigs:main Mar 28, 2022
@aartij17 aartij17 mentioned this pull request Mar 28, 2022
Merged
k8s-ci-robot added a commit that referenced this pull request Mar 28, 2022
@k8s-ci-robot
Merge pull request #1497 from aartij17/backport-secret-deletion
4f05f24 
🐛 Backport secret deletion fix to v1.0.0 from PR #1486
@aartij17 aartij17 mentioned this pull request Mar 28, 2022
Merged
3 tasks
@killianmuldoon killianmuldoon mentioned this pull request Sep 26, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yastij yastij yastij left review comments

@srm09 srm09 srm09 requested changes

@MaxRink MaxRink Awaiting requested review from MaxRink

@vrabbi vrabbi Awaiting requested review from vrabbi

Assignees

@yastij yastij

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Fix v1alpha3 -> v1beta1 upgrade workflow for VSphereClusterIdentity
4 participants
@aartij17 @k8s-ci-robot @yastij @srm09