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

Don't update pvc.status.capacity if pvc is already Bound

Browse Source
This commit is contained in:
Matthew Wong
2017-08-25 15:21:47 -04:00
parent 1f580ae898
commit 19ebaf2870
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -625,6 +625,10 @@ func (ctrl *PersistentVolumeController) updateClaimStatus(claim *v1.PersistentVo
dirty = true dirty = true
} }
// Update Capacity if the claim is becoming Bound, not if it was already.
// A discrepancy can be intentional to mean that the PVC filesystem size
// doesn't match the PV block device size, so don't clobber it
if claim.Status.Phase != phase {
volumeCap, ok := volume.Spec.Capacity[v1.ResourceStorage] volumeCap, ok := volume.Spec.Capacity[v1.ResourceStorage]
if !ok { if !ok {
return nil, fmt.Errorf("PersistentVolume %q is without a storage capacity", volume.Name) return nil, fmt.Errorf("PersistentVolume %q is without a storage capacity", volume.Name)
@@ -635,6 +639,7 @@ func (ctrl *PersistentVolumeController) updateClaimStatus(claim *v1.PersistentVo
dirty = true dirty = true
} }
} }
}
if !dirty { if !dirty {
// Nothing to do. // Nothing to do.