Skip to content

Commit 71b0fbc

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

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

Diff for: pkg/gce-pd-csi-driver/controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1561,7 +1561,7 @@ func createSingleZoneDisk(ctx context.Context, cloudProvider gce.GCECompute, nam
15611561
return nil, fmt.Errorf("got wrong number of zones for zonal create volume: %v", len(zones))
15621562
}
15631563
diskZone := zones[0]
1564-
err := cloudProvider.InsertDisk(ctx, project, meta.ZonalKey(name, diskZone), params, capBytes, capacityRange, nil, snapshotID, volumeContentSourceVolumeID, multiWriter)
1564+
err := cloudProvider.InsertDisk(ctx, project, meta.ZonalKey(name, diskZone), params, capBytes, capacityRange, nil, "", volumeContentSourceVolumeID, multiWriter)
15651565
if err != nil {
15661566
return nil, fmt.Errorf("failed to insert zonal disk: %v", err)
15671567
}

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

-4
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,6 @@ func generateDriverConfigFile(testParams *testParameters) (string, error) {
130130
caps = append(caps, "pvcDataSource")
131131
minimumVolumeSize := "5Gi"
132132
numAllowedTopologies := 1
133-
if testParams.storageClassFile == regionalPDStorageClass {
134-
minimumVolumeSize = "200Gi"
135-
numAllowedTopologies = 2
136-
}
137133
timeouts := map[string]string{
138134
dataSourceProvisionTimeoutKey: dataSourceProvisionTimeout,
139135
}

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-extreme.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)