@@ -381,7 +381,9 @@ default_csi_snapshotter_version () {
381381 echo " v4.0.0"
382382 fi
383383}
384- export CSI_SNAPSHOTTER_HACK_VERSION=" master"
384+ # export CSI_SNAPSHOTTER_HACK_VERSION="master"
385+ # Hack to be consistent with 1.33 job
386+ export CSI_SNAPSHOTTER_HACK_VERSION=" v8.2.0"
385387configvar CSI_SNAPSHOTTER_VERSION " $( default_csi_snapshotter_version) " " external-snapshotter version tag"
386388
387389# Enable installing VolumeGroupSnapshot CRDs (off by default, can be set to true in prow jobs)
@@ -787,9 +789,10 @@ install_csi_driver () {
787789install_snapshot_crds () {
788790 # Wait until volumesnapshot CRDs are in place.
789791 CRD_BASE_DIR=" https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/${CSI_SNAPSHOTTER_HACK_VERSION} /client/config/crd"
790- if [[ ${REPO_DIR} == * " external-snapshotter" * ]]; then
791- CRD_BASE_DIR=" ${REPO_DIR} /client/config/crd"
792- fi
792+ # Hack v1beta2 needs webhook while tests does not deployed
793+ # if [[ ${REPO_DIR} == *"external-snapshotter"* ]]; then
794+ # CRD_BASE_DIR="${REPO_DIR}/client/config/crd"
795+ # fi
793796 echo " Installing snapshot CRDs from ${CRD_BASE_DIR} "
794797 kubectl apply -f " ${CRD_BASE_DIR} /snapshot.storage.k8s.io_volumesnapshotclasses.yaml" --validate=false
795798 kubectl apply -f " ${CRD_BASE_DIR} /snapshot.storage.k8s.io_volumesnapshots.yaml" --validate=false
@@ -831,7 +834,7 @@ install_snapshot_crds() {
831834
832835# Install snapshot controller and associated RBAC, retrying until the pod is running.
833836install_snapshot_controller () {
834- CONTROLLER_DIR=" https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/${CSI_SNAPSHOTTER_HACK_VERSION } "
837+ CONTROLLER_DIR=" https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/${CSI_SNAPSHOTTER_VERSION } "
835838 if [[ ${REPO_DIR} == * " external-snapshotter" * ]]; then
836839 CONTROLLER_DIR=" ${REPO_DIR} "
837840 fi
@@ -892,6 +895,9 @@ install_snapshot_controller() {
892895 # Now replace registry and/or tag
893896 NEW_TAG=" csiprow"
894897 line=" $( echo " $nocomments " | sed -e " s;$image ;${name} :${NEW_TAG} ;" ) "
898+
899+ # Hack the snapshot controller version for test
900+ line=" $( echo " $nocomments " | sed -E " s|(image:[[:space:]]*registry.k8s.io/sig-storage/snapshot-controller:).*|\1${CSI_SNAPSHOTTER_HACK_VERSION} |" ) "
895901 echo " using $line " >&2
896902 fi
897903 if ${CSI_PROW_ENABLE_GROUP_SNAPSHOT} ; then
@@ -1017,6 +1023,7 @@ EOF
10171023 echo " Enabling VolumeGroupSnapshot: replacing hostpath csi-hostpath-plugin.yaml"
10181024 cp " ${source} /test/e2e/testing-manifests/storage-csi/external-snapshotter/volume-group-snapshots/csi-hostpath-plugin.yaml" \
10191025 " ${source} /test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-plugin.yaml"
1026+ cat " ${source} " /test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-plugin.yaml
10201027 fi
10211028
10221029}
0 commit comments