Merge pull request #217 from suneeth51/master

Pass ControllerExpandVolumeSecret info to the VolumeExpand CSI tests
kubernetes-csi · Sep 23, 2019 · a3be817 · a3be817
2 parents 82b0519 + a15b9a0
commit a3be817
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/pkg/sanity/controller.go b/pkg/sanity/controller.go
@@ -2097,6 +2097,7 @@ var _ = DescribeSanity("ExpandVolume [Controller Server]", func(sc *SanityContex
 			CapacityRange: &csi.CapacityRange{
 				RequiredBytes: TestVolumeExpandSize(sc),
 			},
+			Secrets: sc.Secrets.ControllerExpandVolumeSecret,
 		}
 		rsp, err := c.ControllerExpandVolume(context.Background(), expReq)
 		Expect(err).To(HaveOccurred())
@@ -2110,6 +2111,7 @@ var _ = DescribeSanity("ExpandVolume [Controller Server]", func(sc *SanityContex
 	It("should fail if no capacity range is given", func() {
 		expReq := &csi.ControllerExpandVolumeRequest{
 			VolumeId: "",
+			Secrets:  sc.Secrets.ControllerExpandVolumeSecret,
 		}
 		rsp, err := c.ControllerExpandVolume(context.Background(), expReq)
 		Expect(err).To(HaveOccurred())
@@ -2156,6 +2158,7 @@ var _ = DescribeSanity("ExpandVolume [Controller Server]", func(sc *SanityContex
 			CapacityRange: &csi.CapacityRange{
 				RequiredBytes: TestVolumeExpandSize(sc),
 			},
+			Secrets: sc.Secrets.ControllerExpandVolumeSecret,
 		}
 		rsp, err := c.ControllerExpandVolume(context.Background(), expReq)
 		Expect(err).NotTo(HaveOccurred())

diff --git a/pkg/sanity/sanity.go b/pkg/sanity/sanity.go
@@ -48,6 +48,7 @@ type CSISecrets struct {
 	NodePublishVolumeSecret                    map[string]string `yaml:"NodePublishVolumeSecret"`
 	CreateSnapshotSecret                       map[string]string `yaml:"CreateSnapshotSecret"`
 	DeleteSnapshotSecret                       map[string]string `yaml:"DeleteSnapshotSecret"`
+	ControllerExpandVolumeSecret               map[string]string `yaml:"ControllerExpandVolumeSecret"`
 }
 
 // Config provides the configuration for the sanity tests. It