github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages 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
parent 5b49afa66b cd2c8cb5fd
commit b977096f5a
1 changed files with 7 additions and 9 deletions
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) {
// CSI migration scenario - do not depend on in-tree plugin
return nil, nil
}
if metav1.HasAnnotation(volume.ObjectMeta, storagehelpers.AnnMigratedTo) {
// CSI migration scenario - do not depend on in-tree plugin
return nil, nil
}
if volume.Spec.CSI != nil {
// CSI volume source scenario - external provisioner is requested
return nil, nil
}
if volume.Spec.CSI != nil {
// CSI volume source scenario - external provisioner is requested
return nil, nil
}
// The plugin that provisioned the volume was not found or the volume