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

Merge pull request #33 from xing-yang/update_snapshotclass

Browse Source 
Update snapshot class in the content spec
This commit is contained in:
k8s-ci-robot
2018-09-24 14:08:16 -07:00
committed by GitHub
parent 6327ae5d2e 58f71bef8c
commit 4fa90a4738
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
pkg/controller/snapshot_controller.go
View File

@@ -401,21 +401,22 @@ func (ctrl *csiSnapshotController) checkandBindSnapshotContent(snapshot *crdv1.V
return fmt.Errorf("Could not bind snapshot %s and content %s, the VolumeSnapshotRef does not match", snapshot.Name, content.Name) return fmt.Errorf("Could not bind snapshot %s and content %s, the VolumeSnapshotRef does not match", snapshot.Name, content.Name)
} else if content.Spec.VolumeSnapshotRef.UID != "" && content.Spec.VolumeSnapshotRef.UID != snapshot.UID { } else if content.Spec.VolumeSnapshotRef.UID != "" && content.Spec.VolumeSnapshotRef.UID != snapshot.UID {
return fmt.Errorf("Could not bind snapshot %s and content %s, the VolumeSnapshotRef does not match", snapshot.Name, content.Name) return fmt.Errorf("Could not bind snapshot %s and content %s, the VolumeSnapshotRef does not match", snapshot.Name, content.Name)
} else if content.Spec.VolumeSnapshotRef.UID == "" { } else if content.Spec.VolumeSnapshotRef.UID != "" && content.Spec.VolumeSnapshotClassName != nil {
contentClone := content.DeepCopy() return nil
contentClone.Spec.VolumeSnapshotRef.UID = snapshot.UID }
className := *(snapshot.Spec.VolumeSnapshotClassName) contentClone := content.DeepCopy()
contentClone.Spec.VolumeSnapshotClassName = &className contentClone.Spec.VolumeSnapshotRef.UID = snapshot.UID
newContent, err := ctrl.clientset.VolumesnapshotV1alpha1().VolumeSnapshotContents().Update(contentClone) className := *(snapshot.Spec.VolumeSnapshotClassName)
if err != nil { contentClone.Spec.VolumeSnapshotClassName = &className
glog.V(4).Infof("updating VolumeSnapshotContent[%s] error status failed %v", newContent.Name, err) newContent, err := ctrl.clientset.VolumesnapshotV1alpha1().VolumeSnapshotContents().Update(contentClone)
return err if err != nil {
} glog.V(4).Infof("updating VolumeSnapshotContent[%s] error status failed %v", newContent.Name, err)
_, err = ctrl.storeContentUpdate(newContent) return err
if err != nil { }
glog.V(4).Infof("updating VolumeSnapshotContent[%s] error status: cannot update internal cache %v", newContent.Name, err) _, err = ctrl.storeContentUpdate(newContent)
return err if err != nil {
} glog.V(4).Infof("updating VolumeSnapshotContent[%s] error status: cannot update internal cache %v", newContent.Name, err)
return err
} }
return nil return nil
} }