Skip to content

Commit 4041542

Browse files
committed
Squashed 'release-tools/' changes from 4aff857..5d874cc
5d874cc Merge pull request #112 from xing-yang/cleanup 79bbca7 Cleanup d437673 Merge pull request #111 from xing-yang/update_snapshot_v1_rc 57718f8 Update snapshot CRD version git-subtree-dir: release-tools git-subtree-split: 5d874cc
1 parent 75fe9dd commit 4041542

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

prow.sh

+8-1
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,14 @@ configvar CSI_PROW_E2E_ALPHA_GATES_LATEST 'GenericEphemeralVolume=true,CSIStorag
330330
configvar CSI_PROW_E2E_ALPHA_GATES "$(get_versioned_variable CSI_PROW_E2E_ALPHA_GATES "${csi_prow_kubernetes_version_suffix}")" "alpha E2E feature gates"
331331

332332
# Which external-snapshotter tag to use for the snapshotter CRD and snapshot-controller deployment
333-
configvar CSI_SNAPSHOTTER_VERSION 'v3.0.0' "external-snapshotter version tag"
333+
default_csi_snapshotter_version () {
334+
if [ "${CSI_PROW_KUBERNETES_VERSION}" = "latest" ] || [ "${CSI_PROW_DRIVER_CANARY}" = "canary" ]; then
335+
echo "master"
336+
else
337+
echo "v3.0.2"
338+
fi
339+
}
340+
configvar CSI_SNAPSHOTTER_VERSION "$(default_csi_snapshotter_version)" "external-snapshotter version tag"
334341

335342
# Some tests are known to be unusable in a KinD cluster. For example,
336343
# stopping kubelet with "ssh <node IP> systemctl stop kubelet" simply

0 commit comments

Comments
 (0)