Skip to content

Commit 785f3cb

Browse files
Test pd-extreme k8s integration
1 parent c86cc5e commit 785f3cb

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

test/k8s-integration/driver-config.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,9 @@ func generateDriverConfigFile(testParams *testParameters) (string, error) {
127127
snapshotClassName = "no-volumesnapshotclass"
128128
}
129129

130-
caps = append(caps, "pvcDataSource")
130+
if !strings.Contains(testParams.storageClassFile, "sc-extreme") {
131+
caps = append(caps, "pvcDataSource")
132+
}
131133
minimumVolumeSize := "5Gi"
132134
numAllowedTopologies := 1
133135
if testParams.storageClassFile == regionalPDStorageClass {

test/k8s-integration/main.go

+9
Original file line numberDiff line numberDiff line change
@@ -478,6 +478,15 @@ func handle() error {
478478
return fmt.Errorf("Unknown deployment strategy %s", testParams.deploymentStrategy)
479479
}
480480

481+
<<<<<<< HEAD
482+
=======
483+
skipDiskImageSnapshots := false
484+
if mustParseVersion(testParams.clusterVersion).lessThan(mustParseVersion("1.22.0")) {
485+
// Disk image cloning in only supported from 1.22 on.
486+
skipDiskImageSnapshots = true
487+
}
488+
489+
>>>>>>> Test pd-extreme k8s integration
481490
// Run the tests using the k8sSourceDir kubernetes
482491
if len(*storageClassFiles) != 0 {
483492
applicableStorageClassFiles := []string{}

0 commit comments

Comments
 (0)