github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #122030 from carlory/121799

Browse Source 
fix issue with using feature HonorPVReclaimPolicy in csi-provisioner
This commit is contained in:
Kubernetes Prow Robot
2024-01-19 04:35:48 +01:00
committed by GitHub
parent e9756693d0 5ff42b2368
commit eb1ae05cf0
2 changed files with 37 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1958,6 +1958,18 @@ 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 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
// was not dynamically provisioned. Try to find a plugin by spec.
spec := vol.NewSpecFromPersistentVolume(volume, false)