Skip to content

Commit 2e9c71c

Browse files
committed
Make the volume attribute class file a configurable input
The volume attribute class tests are valid for 1.31+ cluster By making the param configurable in the run-k8s-integration-*.sh we can disable the flag in k8s clusters lesser than intended minor version
1 parent 524895b commit 2e9c71c

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

test/run-k8s-integration.sh

+5-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ readonly teardown_driver=${GCE_PD_TEARDOWN_DRIVER:-true}
2828
readonly gke_node_version=${GKE_NODE_VERSION:-}
2929
readonly use_kubetest2=${USE_KUBETEST2:-true}
3030
readonly migration_test=${MIGRATION_TEST:-false}
31+
readonly volumeattributesclass_files=${VOLUME_ATTRIBUTES_CLASS_FILES:-hdb-volumeattributesclass.yaml}
3132

3233
export GCE_PD_VERBOSITY=9
3334

@@ -48,12 +49,15 @@ base_cmd="${PKGDIR}/bin/k8s-integration-test \
4849
--do-driver-build=${do_driver_build} --teardown-driver=${teardown_driver} \
4950
--do-k8s-build=${do_k8s_build} --boskos-resource-type=${boskos_resource_type} \
5051
--storageclass-files=sc-balanced.yaml --snapshotclass-files=pd-volumesnapshotclass.yaml \
51-
--volumeattributesclass-files=hdb-volumeattributesclass.yaml \
5252
--storageclass-for-vac-file=sc-hdb.yaml \
5353
--kube-runtime-config=api/all=true \
5454
--deployment-strategy=${deployment_strategy} --test-version=${test_version} \
5555
--num-nodes=3 --image-type=${image_type} --use-kubetest2=${use_kubetest2}"
5656

57+
if [[ -n "${volumeattributesclass_files}" ]]; then
58+
base_cmd+=" --volumeattributesclass-files=${volumeattributesclass_files}"
59+
fi
60+
5761
if [ "$use_gke_managed_driver" = false ]; then
5862
base_cmd="${base_cmd} --deploy-overlay-name=${overlay_name}"
5963
else

0 commit comments

Comments
 (0)