Merge pull request #168 from arangodb/bugfix/pv-deleted-to-soon

ewoutp · web-flow · commit a373283a2e00 · 2018-06-08T10:30:06.000+02:00
Prevent deleting the PV when the PVC has already been attached to it
diff --git a/pkg/storage/pv_creator.go b/pkg/storage/pv_creator.go
@@ -315,6 +315,10 @@ func (ls *LocalStorage) bindClaimToVolume(claim v1.PersistentVolumeClaim, volume
 
 		// Check claim. If already bound, bail out
 		if !pvcNeedsVolume(*updated) {
+			if updated.Spec.VolumeName == volumeName {
+				log.Info().Msg("PersistentVolumeClaim already bound to PersistentVolume")
+				return nil
+			}
 			return maskAny(fmt.Errorf("PersistentVolumeClaim '%s' no longer needs a volume", claim.GetName()))
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -315,6 +315,10 @@ func (ls *LocalStorage) bindClaimToVolume(claim v1.PersistentVolumeClaim, volume`
`315`	`315`
`316`	`316`	`// Check claim. If already bound, bail out`
`317`	`317`	`if !pvcNeedsVolume(*updated) {`
	`318`	`+ if updated.Spec.VolumeName == volumeName {`
	`319`	`+ log.Info().Msg("PersistentVolumeClaim already bound to PersistentVolume")`
	`320`	`+ return nil`
	`321`	`+ }`
`318`	`322`	`return maskAny(fmt.Errorf("PersistentVolumeClaim '%s' no longer needs a volume", claim.GetName()))`
`319`	`323`	`}`
`320`	`324`