From 7955f68ccbb11627b5a2dd6140d33c24c0efb6d6 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Wed, 24 Mar 2021 17:09:04 +0100 Subject: [PATCH] deploy: enable topology and capacity tests for distributed deployment When using distributed provisioning, topology tests make sense because the driver properly supports topology. CSIStorageCapacity tests are possible if the cluster has the right API. --- deploy/kubernetes-distributed/deploy.sh | 2 +- deploy/kubernetes-distributed/test-driver.yaml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/deploy/kubernetes-distributed/deploy.sh b/deploy/kubernetes-distributed/deploy.sh index 718156d6f..7c70eea39 100755 --- a/deploy/kubernetes-distributed/deploy.sh +++ b/deploy/kubernetes-distributed/deploy.sh @@ -233,5 +233,5 @@ fi # Create a test driver configuration in the place where the prow job # expects it? if [ "${CSI_PROW_TEST_DRIVER}" ]; then - cp "${BASE_DIR}/test-driver.yaml" "${CSI_PROW_TEST_DRIVER}" + sed -e "s/capacity: true/capacity: ${have_csistoragecapacity}/" >"${BASE_DIR}/test-driver.yaml" "${CSI_PROW_TEST_DRIVER}" fi diff --git a/deploy/kubernetes-distributed/test-driver.yaml b/deploy/kubernetes-distributed/test-driver.yaml index d681160d1..2bffaeeac 100644 --- a/deploy/kubernetes-distributed/test-driver.yaml +++ b/deploy/kubernetes-distributed/test-driver.yaml @@ -16,5 +16,8 @@ DriverInfo: persistence: true singleNodeVolume: true topology: true + capacity: true # will be adapted by deploy.sh based on cluster support for CSIStorageCapacity + TopologyKeys: + - topology.hostpath.csi/node InlineVolumes: - shared: true