Merge pull request #104 from oleksiys/master

k8s-ci-robot · web-flow · commit 3d4db44c0460 · 2019-04-16T18:44:03.000-07:00
Use discovered storageclassName to look up the storage class
diff --git a/pkg/controller/snapshot_controller.go b/pkg/controller/snapshot_controller.go
@@ -880,7 +880,7 @@ func (ctrl *csiSnapshotController) getStorageClassFromVolumeSnapshot(snapshot *c
 	if len(storageclassName) == 0 {
 		return nil, fmt.Errorf("cannot figure out the snapshot class automatically, please specify one in snapshot spec")
 	}
-	storageclass, err := ctrl.client.StorageV1().StorageClasses().Get(*pvc.Spec.StorageClassName, metav1.GetOptions{})
+	storageclass, err := ctrl.client.StorageV1().StorageClasses().Get(storageclassName, metav1.GetOptions{})
 	if err != nil {
 		return nil, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -880,7 +880,7 @@ func (ctrl csiSnapshotController) getStorageClassFromVolumeSnapshot(snapshot c`
`880`	`880`	`if len(storageclassName) == 0 {`
`881`	`881`	`return nil, fmt.Errorf("cannot figure out the snapshot class automatically, please specify one in snapshot spec")`
`882`	`882`	`}`
`883`		`- storageclass, err := ctrl.client.StorageV1().StorageClasses().Get(*pvc.Spec.StorageClassName, metav1.GetOptions{})`
	`883`	`+ storageclass, err := ctrl.client.StorageV1().StorageClasses().Get(storageclassName, metav1.GetOptions{})`
`884`	`884`	`if err != nil {`
`885`	`885`	`return nil, err`
`886`	`886`	`}`