Rebase and change usage of Secrets

Author: darkowlzz

pkg/sanity/controller.go

@@ -223,8 +223,8 @@ var _ = DescribeSanity("ListVolumes [Controller Server]", func(sc *SanityContext
 			},
 		}
 
-		if secrets != nil {
-			req.ControllerCreateSecrets = secrets.CreateVolumeSecret
+		if sc.Secrets != nil {
+			req.ControllerCreateSecrets = sc.Secrets.CreateVolumeSecret
 		}
 
 		vol, err := c.CreateVolume(context.Background(), req)
@@ -247,8 +247,8 @@ var _ = DescribeSanity("ListVolumes [Controller Server]", func(sc *SanityContext
 			VolumeId: vol.GetVolume().GetId(),
 		}
 
-		if secrets != nil {
-			delReq.ControllerDeleteSecrets = secrets.DeleteVolumeSecret
+		if sc.Secrets != nil {
+			delReq.ControllerDeleteSecrets = sc.Secrets.DeleteVolumeSecret
 		}
 
 		_, err = c.DeleteVolume(context.Background(), delReq)
@@ -304,8 +304,8 @@ var _ = DescribeSanity("ListVolumes [Controller Server]", func(sc *SanityContext
 					},
 				}
 
-				if secrets != nil {
-					req.ControllerCreateSecrets = secrets.CreateVolumeSecret
+				if sc.Secrets != nil {
+					req.ControllerCreateSecrets = sc.Secrets.CreateVolumeSecret
 				}
 
 				vol, err := c.CreateVolume(context.Background(), req)
@@ -353,8 +353,8 @@ var _ = DescribeSanity("ListVolumes [Controller Server]", func(sc *SanityContext
 					VolumeId: name + strconv.Itoa(i),
 				}
 
-				if secrets != nil {
-					delReq.ControllerDeleteSecrets = secrets.DeleteVolumeSecret
+				if sc.Secrets != nil {
+					delReq.ControllerDeleteSecrets = sc.Secrets.DeleteVolumeSecret
 				}
 
 				_, err := c.DeleteVolume(context.Background(), delReq)