Merge pull request kubernetes-csi#53 from openshift-cherrypick-robot/cherry-pick-52-to-release-4.11

openshift-ci[bot] · web-flow · commit 86277ec2a033 · 2022-07-01T13:54:47.000Z
[release-4.11] Bug 2102782: UPSTREAM: 2101343: fix: changed the csistoragecapacity check namespace
diff --git a/cmd/csi-provisioner/csi-provisioner.go b/cmd/csi-provisioner/csi-provisioner.go
@@ -493,7 +493,7 @@ func main() {
 				Name: "#%123-invalid-name",
 			},
 		}
-		createdCapacity, err := clientset.StorageV1().CSIStorageCapacities("default").Create(ctx, invalidCapacity, metav1.CreateOptions{})
+		createdCapacity, err := clientset.StorageV1().CSIStorageCapacities(namespace).Create(ctx, invalidCapacity, metav1.CreateOptions{})
 		switch {
 		case err == nil:
 			klog.Fatalf("creating an invalid v1.CSIStorageCapacity didn't fail as expected, got: %s", createdCapacity)

Original file line number	Diff line number	Diff line change
`@@ -493,7 +493,7 @@ func main() {`
`493`	`493`	`Name: "#%123-invalid-name",`
`494`	`494`	`},`
`495`	`495`	`}`
`496`		`- createdCapacity, err := clientset.StorageV1().CSIStorageCapacities("default").Create(ctx, invalidCapacity, metav1.CreateOptions{})`
	`496`	`+ createdCapacity, err := clientset.StorageV1().CSIStorageCapacities(namespace).Create(ctx, invalidCapacity, metav1.CreateOptions{})`
`497`	`497`	`switch {`
`498`	`498`	`case err == nil:`
`499`	`499`	`klog.Fatalf("creating an invalid v1.CSIStorageCapacity didn't fail as expected, got: %s", createdCapacity)`