@@ -325,7 +325,7 @@ configvar CSI_PROW_E2E_MOCK "$(if [ "${CSI_PROW_DRIVER_CANARY}" = "canary" ] &&
325325
326326# Regex for non-alpha, feature-tagged tests that should be run.
327327#
328- configvar CSI_PROW_E2E_FOCUS_LATEST ' \[Feature:VolumeSnapshotDataSource\]' " non-alpha, feature-tagged tests for latest Kubernetes version"
328+ configvar CSI_PROW_E2E_FOCUS_LATEST ' \[Feature:VolumeSnapshotDataSource\]|VolumeGroupSnapshottable ' " non-alpha, feature-tagged tests for latest Kubernetes version"
329329configvar CSI_PROW_E2E_FOCUS " $( get_versioned_variable CSI_PROW_E2E_FOCUS " ${csi_prow_kubernetes_version_suffix} " ) " " non-alpha, feature-tagged tests"
330330
331331# Serial vs. parallel is always determined by these regular expressions.
@@ -381,6 +381,7 @@ default_csi_snapshotter_version () {
381381 echo " v4.0.0"
382382 fi
383383}
384+ export CSI_SNAPSHOTTER_HACK_VERSION=" master"
384385configvar CSI_SNAPSHOTTER_VERSION " $( default_csi_snapshotter_version) " " external-snapshotter version tag"
385386
386387# Enable installing VolumeGroupSnapshot CRDs (off by default, can be set to true in prow jobs)
@@ -777,7 +778,7 @@ install_csi_driver () {
777778# Installs all necessary snapshotter CRDs
778779install_snapshot_crds () {
779780 # Wait until volumesnapshot CRDs are in place.
780- CRD_BASE_DIR=" https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/${CSI_SNAPSHOTTER_VERSION } /client/config/crd"
781+ CRD_BASE_DIR=" https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/${CSI_SNAPSHOTTER_HACK_VERSION } /client/config/crd"
781782 if [[ ${REPO_DIR} == * " external-snapshotter" * ]]; then
782783 CRD_BASE_DIR=" ${REPO_DIR} /client/config/crd"
783784 fi
@@ -801,7 +802,7 @@ install_snapshot_crds() {
801802
802803# Installs VolumeGroupSnapshot CRDs (VolumeGroupSnapshot, VolumeGroupSnapshotContent, VolumeGroupSnapshotClass)
803804install_volumegroupsnapshot_crds () {
804- local crd_base_dir=" https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/${CSI_SNAPSHOTTER_VERSION } /client/config/crd"
805+ local crd_base_dir=" https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/${CSI_SNAPSHOTTER_HACK_VERSION } /client/config/crd"
805806
806807 # If we are running inside the external-snapshotter repo, use local files instead of GitHub
807808 if [[ ${REPO_DIR} == * " external-snapshotter" * ]]; then
@@ -832,7 +833,7 @@ install_volumegroupsnapshot_crds() {
832833
833834# Install snapshot controller and associated RBAC, retrying until the pod is running.
834835install_snapshot_controller () {
835- CONTROLLER_DIR=" https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/${CSI_SNAPSHOTTER_VERSION } "
836+ CONTROLLER_DIR=" https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/${CSI_SNAPSHOTTER_HACK_VERSION } "
836837 if [[ ${REPO_DIR} == * " external-snapshotter" * ]]; then
837838 CONTROLLER_DIR=" ${REPO_DIR} "
838839 fi
@@ -1433,7 +1434,7 @@ main () {
14331434 install_snapshot_controller
14341435
14351436 # TODO: Remove the condition after the vgs GA
1436- if ${CSI_PROW_ENABLE_GROUP_SNAPSHOT} ; then
1437+ if [ " ${CSI_PROW_ENABLE_GROUP_SNAPSHOT} " = " true " ] ; then
14371438 install_volumegroupsnapshot_crds
14381439 fi
14391440
0 commit comments