Skip to content

Conversation

@mattcary
Copy link
Contributor

/kind bug

What this PR does / why we need it:

If there are disks with the same name across multiple zones, and a legacy (pre-migration) volume is used, unpublish will fail when trying to reconstruct the full volume key. However, since we have the node when we are unpublishing, we do know the zone and can detach the correct disk.

Failing to do this results in stuck workloads for customers, as if they manually create a node in a second zone before detaching a similarly named one, they can never unpublish.

Which issue(s) this PR fixes:

This was found in internal testing in GKE.

Unpublish a legacy zonal disk even if there multiple disks with the same name across zones.

@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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Oct 22, 2025
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mattcary

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 Oct 22, 2025
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 22, 2025
@tonyzhc tonyzhc self-assigned this Oct 23, 2025
@tonyzhc
Copy link
Contributor

tonyzhc commented Oct 23, 2025

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 23, 2025
Change-Id: I4e8cd457ab869f52e9202d2d1640c902b169f330
@k8s-ci-robot
Copy link
Contributor

New changes are detected. LGTM label has been removed.

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

k8s-ci-robot commented Oct 23, 2025

@mattcary: The following tests 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-gcp-compute-persistent-disk-csi-driver-e2e-arm 42459e5 link false /test pull-gcp-compute-persistent-disk-csi-driver-e2e-arm
pull-gcp-compute-persistent-disk-csi-driver-e2e-windows-2022 42459e5 link false /test pull-gcp-compute-persistent-disk-csi-driver-e2e-windows-2022

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-sigs/prow repository. I understand the commands that are listed here.

@mattcary mattcary merged commit 4c5bb0b into kubernetes-sigs:master Oct 27, 2025
7 of 10 checks passed
@mattcary
Copy link
Contributor Author

/cherry-pick release-1.21

@k8s-infra-cherrypick-robot

@mattcary: #2207 failed to apply on top of branch "release-1.21":

Applying: Unpublish legacy volume even if it appears in multiple zones
Using index info to reconstruct a base tree...
M	pkg/gce-cloud-provider/compute/fake-gce.go
M	pkg/gce-cloud-provider/compute/gce-compute.go
M	pkg/gce-cloud-provider/compute/gce-compute_test.go
M	pkg/gce-pd-csi-driver/controller.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/gce-pd-csi-driver/controller.go
Auto-merging pkg/gce-cloud-provider/compute/gce-compute_test.go
Auto-merging pkg/gce-cloud-provider/compute/gce-compute.go
CONFLICT (content): Merge conflict in pkg/gce-cloud-provider/compute/gce-compute.go
Auto-merging pkg/gce-cloud-provider/compute/fake-gce.go
CONFLICT (content): Merge conflict in pkg/gce-cloud-provider/compute/fake-gce.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Unpublish legacy volume even if it appears in multiple zones

In response to this:

/cherry-pick release-1.21

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-sigs/prow repository.

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. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants