github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-08 03:33:56 +00:00
Code Issues Projects Releases Wiki Activity

Delete provisioned volumes that are not needed.

Browse Source 
We should delete volumes that are provisioned for a claim and the claim
gets bound to different volume during the provisioning.
This commit is contained in:
Jan Safranek 2016-05-17 14:55:27 +02:00
parent 9fb0f7a3fd
commit 92dc159ab6
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/controller/persistentvolume/persistentvolume_controller.go
View File

@ -672,6 +672,19 @@ func (ctrl *PersistentVolumeController) syncVolume(volume *api.PersistentVolume)
return nil return nil
} else { } else {
// Volume is bound to a claim, but the claim is bound elsewhere // Volume is bound to a claim, but the claim is bound elsewhere
if hasAnnotation(volume.ObjectMeta, annDynamicallyProvisioned) && volume.Spec.PersistentVolumeReclaimPolicy == api.PersistentVolumeReclaimDelete {
// This volume was dynamically provisioned for this claim. The
// claim got bound elsewhere, and thus this volume is not
// needed. Delete it.
if err = ctrl.reclaimVolume(volume); err != nil {
// Deletion failed, we will fall back into the same condition
// in the next call to this method
return err
}
return nil
} else {
// Volume is bound to a claim, but the claim is bound elsewhere
// and it's not dynamically provisioned.
if hasAnnotation(volume.ObjectMeta, annBoundByController) { if hasAnnotation(volume.ObjectMeta, annBoundByController) {
// This is part of the normal operation of the controller; the // This is part of the normal operation of the controller; the
// controller tried to use this volume for a claim but the claim // controller tried to use this volume for a claim but the claim
@ -694,6 +707,7 @@ func (ctrl *PersistentVolumeController) syncVolume(volume *api.PersistentVolume)
} }
} }
} }
}
} }
// Run starts all of this controller's control loops // Run starts all of this controller's control loops