From 95e86ad228c9090067d4cc211c472acf7b075a6a Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Fri, 13 Nov 2020 17:03:00 +0100 Subject: [PATCH] Squashed 'release-tools/' changes from 4aff857d..5d874cce 5d874cce Merge pull request #112 from xing-yang/cleanup 79bbca7b Cleanup d4376730 Merge pull request #111 from xing-yang/update_snapshot_v1_rc 57718f83 Update snapshot CRD version git-subtree-dir: release-tools git-subtree-split: 5d874cce4e649dfd254d01b9b44179ffa72aee75 --- prow.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/prow.sh b/prow.sh index 1ada24803..75eedbdbd 100755 --- a/prow.sh +++ b/prow.sh @@ -330,7 +330,14 @@ configvar CSI_PROW_E2E_ALPHA_GATES_LATEST 'GenericEphemeralVolume=true,CSIStorag configvar CSI_PROW_E2E_ALPHA_GATES "$(get_versioned_variable CSI_PROW_E2E_ALPHA_GATES "${csi_prow_kubernetes_version_suffix}")" "alpha E2E feature gates" # Which external-snapshotter tag to use for the snapshotter CRD and snapshot-controller deployment -configvar CSI_SNAPSHOTTER_VERSION 'v3.0.0' "external-snapshotter version tag" +default_csi_snapshotter_version () { + if [ "${CSI_PROW_KUBERNETES_VERSION}" = "latest" ] || [ "${CSI_PROW_DRIVER_CANARY}" = "canary" ]; then + echo "master" + else + echo "v3.0.2" + fi +} +configvar CSI_SNAPSHOTTER_VERSION "$(default_csi_snapshotter_version)" "external-snapshotter version tag" # Some tests are known to be unusable in a KinD cluster. For example, # stopping kubelet with "ssh systemctl stop kubelet" simply