github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Make standalone function to check for (pre-)bound volumes.

Browse Source 
Note the semantic change, we now check for UID=""
This commit is contained in:
Jan Safranek 2016-05-17 14:55:06 +02:00
parent 20305f9235
commit a195802d3e
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -270,3 +270,19 @@ func (ctrl *PersistentVolumeController) Stop() {
func (ctrl *PersistentVolumeController) isFullySynced() bool { func (ctrl *PersistentVolumeController) isFullySynced() bool {
return ctrl.volumeController.HasSynced() && ctrl.claimController.HasSynced() return ctrl.volumeController.HasSynced() && ctrl.claimController.HasSynced()
} }
// isVolumeBoundToClaim returns true, if given volume is pre-bound or bound
// to specific claim. Both claim.Name and claim.Namespace must be equal.
// If claim.UID is present in volume.Spec.ClaimRef, it must be equal too.
func isVolumeBoundToClaim(volume *api.PersistentVolume, claim *api.PersistentVolumeClaim) bool {
if volume.Spec.ClaimRef == nil {
return false
}
if claim.Name != volume.Spec.ClaimRef.Name || claim.Namespace != volume.Spec.ClaimRef.Namespace {
return false
}
if volume.Spec.ClaimRef.UID != "" && claim.UID != volume.Spec.ClaimRef.UID {
return false
}
return true
}

4
pkg/controller/persistentvolume/persistentvolume_index.go
View File

@ -92,8 +92,8 @@ func (pvIndex *persistentVolumeOrderedIndex) findByClaim(claim *api.PersistentVo
continue continue
} }
if claim.Name == volume.Spec.ClaimRef.Name && claim.Namespace == volume.Spec.ClaimRef.Namespace && claim.UID == volume.Spec.ClaimRef.UID { if isVolumeBoundToClaim(volume, claim) {
// exact match! No search required. // Exact match! No search required.
return volume, nil return volume, nil
} }
} }