hack snapshoter version

Author: Phaow

release-tools/prow.sh

@@ -325,7 +325,7 @@ configvar CSI_PROW_E2E_MOCK "$(if [ "${CSI_PROW_DRIVER_CANARY}" = "canary" ] &&
 
 # Regex for non-alpha, feature-tagged tests that should be run.
 #
-configvar CSI_PROW_E2E_FOCUS_LATEST '\[Feature:VolumeSnapshotDataSource\]' "non-alpha, feature-tagged tests for latest Kubernetes version"
+configvar CSI_PROW_E2E_FOCUS_LATEST '\[Feature:VolumeSnapshotDataSource\]|\[Feature:volumegroupsnapshot\]' "non-alpha, feature-tagged tests for latest Kubernetes version"
 configvar CSI_PROW_E2E_FOCUS "$(get_versioned_variable CSI_PROW_E2E_FOCUS "${csi_prow_kubernetes_version_suffix}")" "non-alpha, feature-tagged tests"
 
 # Serial vs. parallel is always determined by these regular expressions.
@@ -381,6 +381,7 @@ default_csi_snapshotter_version () {
 		echo "v4.0.0"
 	fi
 }
+export CSI_SNAPSHOTTER_HACK_VERSION="master"
 configvar CSI_SNAPSHOTTER_VERSION "$(default_csi_snapshotter_version)" "external-snapshotter version tag"
 
 # Enable installing VolumeGroupSnapshot CRDs (off by default, can be set to true in prow jobs)
@@ -777,7 +778,7 @@ install_csi_driver () {
 # Installs all necessary snapshotter CRDs
 install_snapshot_crds() {
   # Wait until volumesnapshot CRDs are in place.
-  CRD_BASE_DIR="https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/${CSI_SNAPSHOTTER_VERSION}/client/config/crd"
+  CRD_BASE_DIR="https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/${CSI_SNAPSHOTTER_HACK_VERSION}/client/config/crd"
   if [[ ${REPO_DIR} == *"external-snapshotter"* ]]; then
       CRD_BASE_DIR="${REPO_DIR}/client/config/crd"
   fi
@@ -797,21 +798,10 @@ install_snapshot_crds() {
 	cnt=$((cnt + 1))
     sleep 2
   done
-}
-
-# Installs VolumeGroupSnapshot CRDs (VolumeGroupSnapshot, VolumeGroupSnapshotContent, VolumeGroupSnapshotClass)
-install_volumegroupsnapshot_crds() {
-  local crd_base_dir="https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/${CSI_SNAPSHOTTER_VERSION}/client/config/crd"
-
-  # If we are running inside the external-snapshotter repo, use local files instead of GitHub
-  if [[ ${REPO_DIR} == *"external-snapshotter"* ]]; then
-    crd_base_dir="${REPO_DIR}/client/config/crd"
-  fi
-
   echo "Installing VolumeGroupSnapshot CRDs from ${crd_base_dir}"
-  kubectl apply -f "${crd_base_dir}/groupsnapshot.storage.k8s.io_volumegroupsnapshotclasses.yaml" --validate=false
-  kubectl apply -f "${crd_base_dir}/groupsnapshot.storage.k8s.io_volumegroupsnapshotcontents.yaml" --validate=false
-  kubectl apply -f "${crd_base_dir}/groupsnapshot.storage.k8s.io_volumegroupsnapshots.yaml" --validate=false
+  kubectl apply -f "${CRD_BASE_DIR}/groupsnapshot.storage.k8s.io_volumegroupsnapshotclasses.yaml" --validate=false
+  kubectl apply -f "${CRD_BASE_DIR}/groupsnapshot.storage.k8s.io_volumegroupsnapshotcontents.yaml" --validate=false
+  kubectl apply -f "${CRD_BASE_DIR}/groupsnapshot.storage.k8s.io_volumegroupsnapshots.yaml" --validate=false
 
   local cnt=0
   until kubectl get volumegroupsnapshotclasses.groupsnapshot.storage.k8s.io \
@@ -827,12 +817,12 @@ install_volumegroupsnapshot_crds() {
   done
 
   echo "VolumeGroupSnapshot CRDs installed and ready"
-}
 
+}
 
 # Install snapshot controller and associated RBAC, retrying until the pod is running.
 install_snapshot_controller() {
-  CONTROLLER_DIR="https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/${CSI_SNAPSHOTTER_VERSION}"
+  CONTROLLER_DIR="https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/${CSI_SNAPSHOTTER_HACK_VERSION}"
   if [[ ${REPO_DIR} == *"external-snapshotter"* ]]; then
       CONTROLLER_DIR="${REPO_DIR}"
   fi
@@ -895,6 +885,12 @@ install_snapshot_controller() {
                   line="$(echo "$nocomments" | sed -e "s;$image;${name}:${NEW_TAG};")"
 	          echo "        using $line" >&2
               fi
+              # inject feature gate after leader election arg
+              if echo "$nocomments" | grep -q '^[[:space:]]*- "--leader-election=true"'; then
+                  echo "$line"
+                  echo "            - \"--feature-gates=CSIVolumeGroupSnapshot=true\""
+                  continue
+              fi
               echo "$line"
           done)"
           if ! echo "$modified" | kubectl apply -f -; then
@@ -910,13 +906,14 @@ install_snapshot_controller() {
       # shellcheck disable=SC2001
       modified="$(echo "$yaml" | sed -e "s;image: .*/\([^/:]*\):.*;image: ${CSI_PROW_DRIVER_CANARY_REGISTRY}/\1:canary;")"
       diff <(echo "$yaml") <(echo "$modified")
+
       if ! echo "$modified" | kubectl apply -f -; then
           echo "modified version of $SNAPSHOT_CONTROLLER_YAML:"
           echo "$modified"
           exit 1
       fi
   else
-      if [ "${CSI_PROW_ENABLE_GROUP_SNAPSHOT}" = "true" ]; then
+      if ${CSI_PROW_ENABLE_GROUP_SNAPSHOT}; then
           echo "Deploying snapshot-controller with CSIVolumeGroupSnapshot feature gate enabled"
           curl -s "$SNAPSHOT_CONTROLLER_YAML" | \
             awk '/--leader-election=true/ {print; print "            - \"--feature-gates=CSIVolumeGroupSnapshot=true\""; next}1' | \
@@ -1432,12 +1429,6 @@ main () {
             install_snapshot_crds
             install_snapshot_controller
 
-            # TODO: Remove the condition after the vgs GA
-            if ${CSI_PROW_ENABLE_GROUP_SNAPSHOT}; then
-                install_volumegroupsnapshot_crds
-            fi
-
-
             # Installing the driver might be disabled.
             if ${CSI_PROW_DRIVER_INSTALL} "$images"; then
                 collect_cluster_info