Skip to content

Commit 635af34

Browse files
committed
test: add noProvisionerSecret e2e test
1 parent 4541a1a commit 635af34

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

deploy/example/e2e_usage.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ provisioner: smb.csi.k8s.io
2222
parameters:
2323
source: "//smb-server.default.svc.cluster.local/share"
2424
# if csi.storage.k8s.io/provisioner-secret is provided, will create a sub directory
25-
# with PV name by default under source
25+
# with PV name under source
2626
csi.storage.k8s.io/provisioner-secret-name: "smbcreds"
2727
csi.storage.k8s.io/provisioner-secret-namespace: "default"
2828
csi.storage.k8s.io/node-stage-secret-name: "smbcreds"
@@ -53,7 +53,7 @@ parameters:
5353
# On Windows, "*.default.svc.cluster.local" could not be recognized by csi-proxy
5454
source: "//smb-server.default.svc.cluster.local/share"
5555
# if csi.storage.k8s.io/provisioner-secret is provided, will create a sub directory
56-
# with PV name by default under source
56+
# with PV name under source
5757
csi.storage.k8s.io/provisioner-secret-name: "smbcreds"
5858
csi.storage.k8s.io/provisioner-secret-namespace: "default"
5959
csi.storage.k8s.io/node-stage-secret-name: "smbcreds"

deploy/example/storageclass-smb.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ parameters:
88
# On Windows, "*.default.svc.cluster.local" could not be recognized by csi-proxy
99
source: "//smb-server.default.svc.cluster.local/share"
1010
# if csi.storage.k8s.io/provisioner-secret is provided, will create a sub directory
11-
# with PV name by default under source
11+
# with PV name under source
1212
csi.storage.k8s.io/provisioner-secret-name: "smbcreds"
1313
csi.storage.k8s.io/provisioner-secret-namespace: "default"
1414
csi.storage.k8s.io/node-stage-secret-name: "smbcreds"

test/e2e/dynamic_provisioning_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ var _ = ginkgo.Describe("Dynamic Provisioning", func() {
356356
test := testsuites.DynamicallyProvisionedVolumeSubpathTester{
357357
CSIDriver: testDriver,
358358
Pods: pods,
359-
StorageClassParameters: defaultStorageClassParameters,
359+
StorageClassParameters: noProvisionerSecretStorageClassParameters,
360360
}
361361
test.Run(cs, ns)
362362
})

test/e2e/suite_test.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,23 @@ var (
4949
isWindowsCluster = os.Getenv(testWindowsEnvVar) != ""
5050
defaultStorageClassParameters = map[string]string{
5151
"source": "//smb-server.default.svc.cluster.local/share",
52-
"csi.storage.k8s.io/node-stage-secret-name": "smbcreds",
53-
"csi.storage.k8s.io/node-stage-secret-namespace": "default",
5452
"csi.storage.k8s.io/provisioner-secret-name": "smbcreds",
5553
"csi.storage.k8s.io/provisioner-secret-namespace": "default",
54+
"csi.storage.k8s.io/node-stage-secret-name": "smbcreds",
55+
"csi.storage.k8s.io/node-stage-secret-namespace": "default",
5656
}
5757
subDirStorageClassParameters = map[string]string{
5858
"source": "//smb-server.default.svc.cluster.local/",
5959
"subDir": "share",
60-
"csi.storage.k8s.io/node-stage-secret-name": "smbcreds",
61-
"csi.storage.k8s.io/node-stage-secret-namespace": "default",
6260
"csi.storage.k8s.io/provisioner-secret-name": "smbcreds",
6361
"csi.storage.k8s.io/provisioner-secret-namespace": "default",
62+
"csi.storage.k8s.io/node-stage-secret-name": "smbcreds",
63+
"csi.storage.k8s.io/node-stage-secret-namespace": "default",
64+
}
65+
noProvisionerSecretStorageClassParameters = map[string]string{
66+
"source": "//smb-server.default.svc.cluster.local/share",
67+
"csi.storage.k8s.io/node-stage-secret-name": "smbcreds",
68+
"csi.storage.k8s.io/node-stage-secret-namespace": "default",
6469
}
6570
)
6671

0 commit comments

Comments
 (0)