Skip to content

Commit c439258

Browse files
Test pd-extreme k8s integration
1 parent a11cd4b commit c439258

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

Diff for: test/k8s-integration/driver-config.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,12 @@ func generateDriverConfigFile(testParams *testParameters) (string, error) {
127127
snapshotClassName = "no-volumesnapshotclass"
128128
}
129129

130-
caps = append(caps, "pvcDataSource")
130+
if strings.Contains(testParams.storageClassFile, "sc-standard") {
131+
caps = append(caps, "pvcDataSource")
132+
}
131133
minimumVolumeSize := "5Gi"
132134
numAllowedTopologies := 1
133-
if testParams.storageClassFile == regionalPDStorageClass {
135+
if testParams.storageClassFile == regionalPDStorageClass && !strings.Contains(testParams.storageClassFile, "sc-extreme") {
134136
minimumVolumeSize = "200Gi"
135137
numAllowedTopologies = 2
136138
}

Diff for: test/k8s-integration/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ func handle() error {
479479
}
480480

481481
skipDiskImageSnapshots := false
482-
if mustParseVersion(testParams.clusterVersion).lessThan(mustParseVersion("1.22.0")) || strings.Contains(testParams.storageClassFile, "sc-extreme") {
482+
if mustParseVersion(testParams.clusterVersion).lessThan(mustParseVersion("1.22.0")) {
483483
// Disk image cloning in only supported from 1.22 on.
484484
skipDiskImageSnapshots = true
485485
}

Diff for: test/run-k8s-integration.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ fi
4545
base_cmd="${PKGDIR}/bin/k8s-integration-test \
4646
--run-in-prow=true --service-account-file=${E2E_GOOGLE_APPLICATION_CREDENTIALS} \
4747
--do-driver-build=${do_driver_build} --teardown-driver=${teardown_driver} --boskos-resource-type=${boskos_resource_type} \
48-
--storageclass-files=sc-standard.yaml --snapshotclass-files=pd-volumesnapshotclass.yaml \
48+
--storageclass-files=sc-standard.yaml \
4949
--deployment-strategy=${deployment_strategy} --test-version=${test_version} \
5050
--num-nodes=3 --image-type=${image_type} --use-kubetest2=${use_kubetest2}"
5151

0 commit comments

Comments
 (0)