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

Fix CSI migration for vSphere volumes #122341

Merged
merged 1 commit into from
Dec 15, 2023

Conversation

jsafrane
Copy link
Member

@jsafrane jsafrane commented Dec 15, 2023

What type of PR is this?

/kind bug

What this PR does / why we need it:

Restore migratedPlugins entry for in-tree vSphere volumes and mark them as migrated. Otherwise the CSI volume plugin ignores in-tree vSphere volumes and they will never get attached / mounted by CSI migration.

The entry in migratedPlugins was incorrectly removed during CSIMigrationvSphere feature gate removal.

Which issue(s) this PR fixes:

Fixes #122340

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Fixed 1.29.0+ regression in migration of in-tree vSphere volumes to the CSI driver.

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:


Restore `migratedPlugins` entry for in-tree vSphere volumes and mark them
as migrated. Otherwise the CSI volume plugin ignores in-tree vSphere
volumes and they will never get attached / mounted by CSI migration.

The entry in `migratedPlugins` was incorrectly removed during
CSIMigrationvSphere feature gate removal.
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Dec 15, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jsafrane

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 Dec 15, 2023
@k8s-ci-robot k8s-ci-robot added sig/storage Categorizes an issue or PR as relevant to SIG Storage. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Dec 15, 2023
@jsafrane
Copy link
Member Author

/priority important-soon
/tirage accepted

@k8s-ci-robot k8s-ci-robot added the priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. label Dec 15, 2023
@jsafrane
Copy link
Member Author

/triage accepted

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Dec 15, 2023
@jsafrane
Copy link
Member Author

cc @xing-yang @gnufied

@gnufied
Copy link
Member

gnufied commented Dec 15, 2023

lgtm but want to hear from either @xing-yang or @divyenpatel

/lgtm
/hold

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 15, 2023
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 15, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 1bab9c0cf957237a97a164d3d8145b4fbc849172

@xing-yang
Copy link
Contributor

/assign @divyenpatel

@xing-yang
Copy link
Contributor

/lgtm
I think this fix is correct. I'll let @divyenpatel to take a look.

@gnufied
Copy link
Member

gnufied commented Dec 15, 2023

I am going to remove the hold though. I think this PR makese sense.

/hold cancel

@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 Dec 15, 2023
@k8s-ci-robot k8s-ci-robot merged commit 55f1e21 into kubernetes:master Dec 15, 2023
18 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.30 milestone Dec 15, 2023
@jsafrane
Copy link
Member Author

/cherry-pick release-1.29
Does it work here?

k8s-ci-robot added a commit that referenced this pull request Dec 21, 2023
…2341-upstream-release-1.29

Automated cherry pick of #122341: Fix CSI migration for vSphere volumes
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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/storage Categorizes an issue or PR as relevant to SIG Storage. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

vSphere CSI migration is broken in 1.29.0
5 participants