github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #125767 from carlory/fix-external-provisioner-1235

Browse Source 
Fix pv reclaim failed due to its phase is wrongly updated to the Failed state by kcm
This commit is contained in:
Kubernetes Prow Robot 2024-07-11 07:45:18 -07:00 committed by GitHub
commit b977096f5a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/controller/volume/persistentvolume/pv_controller.go
View File

@ -1935,16 +1935,14 @@ func (ctrl *PersistentVolumeController) findDeletablePlugin(volume *v1.Persisten
} }
} }
if utilfeature.DefaultFeatureGate.Enabled(features.HonorPVReclaimPolicy) { if metav1.HasAnnotation(volume.ObjectMeta, storagehelpers.AnnMigratedTo) {
if metav1.HasAnnotation(volume.ObjectMeta, storagehelpers.AnnMigratedTo) { // CSI migration scenario - do not depend on in-tree plugin
// CSI migration scenario - do not depend on in-tree plugin return nil, nil
return nil, nil }
}
if volume.Spec.CSI != nil { if volume.Spec.CSI != nil {
// CSI volume source scenario - external provisioner is requested // CSI volume source scenario - external provisioner is requested
return nil, nil return nil, nil
}
} }
// The plugin that provisioned the volume was not found or the volume // The plugin that provisioned the volume was not found or the volume