alexlebens/external-snapshotter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename Ready to ReadyToUse

Browse Source 
This PR renames Ready to ReadyToUse in VolumeSnapshot Status
to be consistent with the name in CSI spec.
This commit is contained in:
Xing Yang
2018-11-26 19:21:43 -08:00
parent 2840dd887f
commit bfba4cba0f
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/apis/volumesnapshot/v1alpha1/types.go
View File

@@ -96,12 +96,12 @@ type VolumeSnapshotStatus struct {
// +optional // +optional
RestoreSize *resource.Quantity `json:"restoreSize" protobuf:"bytes,2,opt,name=restoreSize"` RestoreSize *resource.Quantity `json:"restoreSize" protobuf:"bytes,2,opt,name=restoreSize"`
// Ready is set to true only if the snapshot is ready to use (e.g., finish uploading if // ReadyToUse is set to true only if the snapshot is ready to use (e.g., finish uploading if
// there is an uploading phase) and also VolumeSnapshot and its VolumeSnapshotContent // there is an uploading phase) and also VolumeSnapshot and its VolumeSnapshotContent
// bind correctly with each other. If any of the above condition is not true, Ready is // bind correctly with each other. If any of the above condition is not true, ReadyToUse is
// set to false // set to false
// +optional // +optional
Ready bool `json:"ready" protobuf:"varint,3,opt,name=ready"` ReadyToUse bool `json:"readyToUse" protobuf:"varint,3,opt,name=readyToUse"`
// The last error encountered during create snapshot operation, if any. // The last error encountered during create snapshot operation, if any.
// This field must only be set by the entity completing the create snapshot // This field must only be set by the entity completing the create snapshot

2
pkg/controller/framework_test.go
View File

@@ -815,7 +815,7 @@ func newSnapshot(name, className, boundToContent, snapshotUID, claimName string,
}, },
Status: crdv1.VolumeSnapshotStatus{ Status: crdv1.VolumeSnapshotStatus{
CreationTime: creationTime, CreationTime: creationTime,
Ready: ready, ReadyToUse: ready,
Error: err, Error: err,
RestoreSize: size, RestoreSize: size,
}, },

8
pkg/controller/snapshot_controller.go
View File

@@ -154,7 +154,7 @@ func (ctrl *csiSnapshotController) syncContent(content *crdv1.VolumeSnapshotCont
func (ctrl *csiSnapshotController) syncSnapshot(snapshot *crdv1.VolumeSnapshot) error { func (ctrl *csiSnapshotController) syncSnapshot(snapshot *crdv1.VolumeSnapshot) error {
glog.V(5).Infof("synchonizing VolumeSnapshot[%s]: %s", snapshotKey(snapshot), getSnapshotStatusForLogging(snapshot)) glog.V(5).Infof("synchonizing VolumeSnapshot[%s]: %s", snapshotKey(snapshot), getSnapshotStatusForLogging(snapshot))
if !snapshot.Status.Ready { if !snapshot.Status.ReadyToUse {
return ctrl.syncUnreadySnapshot(snapshot) return ctrl.syncUnreadySnapshot(snapshot)
} else { } else {
return ctrl.syncReadySnapshot(snapshot) return ctrl.syncReadySnapshot(snapshot)
@@ -379,7 +379,7 @@ func (ctrl *csiSnapshotController) updateSnapshotErrorStatusWithEvent(snapshot *
} }
snapshotClone.Status.Error = statusError snapshotClone.Status.Error = statusError
snapshotClone.Status.Ready = false snapshotClone.Status.ReadyToUse = false
newSnapshot, err := ctrl.clientset.VolumesnapshotV1alpha1().VolumeSnapshots(snapshotClone.Namespace).Update(snapshotClone) newSnapshot, err := ctrl.clientset.VolumesnapshotV1alpha1().VolumeSnapshots(snapshotClone.Namespace).Update(snapshotClone)
if err != nil { if err != nil {
glog.V(4).Infof("updating VolumeSnapshot[%s] error status failed %v", snapshotKey(snapshot), err) glog.V(4).Infof("updating VolumeSnapshot[%s] error status failed %v", snapshotKey(snapshot), err)
@@ -399,7 +399,7 @@ func (ctrl *csiSnapshotController) updateSnapshotErrorStatusWithEvent(snapshot *
// Stateless functions // Stateless functions
func getSnapshotStatusForLogging(snapshot *crdv1.VolumeSnapshot) string { func getSnapshotStatusForLogging(snapshot *crdv1.VolumeSnapshot) string {
return fmt.Sprintf("bound to: %q, Completed: %v", snapshot.Spec.SnapshotContentName, snapshot.Status.Ready) return fmt.Sprintf("bound to: %q, Completed: %v", snapshot.Spec.SnapshotContentName, snapshot.Status.ReadyToUse)
} }
func IsSnapshotBound(snapshot *crdv1.VolumeSnapshot, content *crdv1.VolumeSnapshotContent) bool { func IsSnapshotBound(snapshot *crdv1.VolumeSnapshot, content *crdv1.VolumeSnapshotContent) bool {
@@ -721,7 +721,7 @@ func (ctrl *csiSnapshotController) updateSnapshotStatus(snapshot *crdv1.VolumeSn
snapshotClone := snapshot.DeepCopy() snapshotClone := snapshot.DeepCopy()
if readyToUse { if readyToUse {
if bound { if bound {
status.Ready = true status.ReadyToUse = true
// Remove the error if checking snapshot is already bound and ready // Remove the error if checking snapshot is already bound and ready
status.Error = nil status.Error = nil
change = true change = true