Skip to content

Commit dde93b2

Browse files
committed
Update to snapshot-controller v3.0.0
1 parent a0f195c commit dde93b2

File tree

1 file changed

+8
-26
lines changed

1 file changed

+8
-26
lines changed

Diff for: prow.sh

+8-26
Original file line numberDiff line numberDiff line change
@@ -298,11 +298,7 @@ tests_need_alpha_cluster () {
298298

299299
# Regex for non-alpha, feature-tagged tests that should be run.
300300
#
301-
# Starting with 1.17, snapshots is beta, but the E2E tests still have the
302-
# [Feature:] tag. They need to be explicitly enabled.
303-
configvar CSI_PROW_E2E_FOCUS_1_15 '^' "non-alpha, feature-tagged tests for Kubernetes = 1.15" # no tests to run, match nothing
304-
configvar CSI_PROW_E2E_FOCUS_1_16 '^' "non-alpha, feature-tagged tests for Kubernetes = 1.16" # no tests to run, match nothing
305-
configvar CSI_PROW_E2E_FOCUS_LATEST '\[Feature:VolumeSnapshotDataSource\]' "non-alpha, feature-tagged tests for Kubernetes >= 1.17"
301+
configvar CSI_PROW_E2E_FOCUS_LATEST '\[Feature:VolumeSnapshotDataSource\]' "non-alpha, feature-tagged tests for latest Kubernetes version"
306302
configvar CSI_PROW_E2E_FOCUS "$(get_versioned_variable CSI_PROW_E2E_FOCUS "${csi_prow_kubernetes_version_suffix}")" "non-alpha, feature-tagged tests"
307303

308304
# Serial vs. parallel is always determined by these regular expressions.
@@ -324,7 +320,7 @@ regex_join () {
324320
# alpha in previous Kubernetes releases. This was considered too
325321
# error prone. Therefore we use E2E tests that match the Kubernetes
326322
# version that is getting tested.
327-
configvar CSI_PROW_E2E_ALPHA_LATEST '\[Feature:' "alpha tests for Kubernetes >= 1.14" # there's no need to update this, adding a new case for CSI_PROW_E2E for a new Kubernetes is enough
323+
configvar CSI_PROW_E2E_ALPHA_LATEST '\[Feature:' "alpha tests for latest Kubernetes version" # there's no need to update this, adding a new case for CSI_PROW_E2E for a new Kubernetes is enough
328324
configvar CSI_PROW_E2E_ALPHA "$(get_versioned_variable CSI_PROW_E2E_ALPHA "${csi_prow_kubernetes_version_suffix}")" "alpha tests"
329325

330326
# After the parallel E2E test without alpha features, a test cluster
@@ -339,15 +335,13 @@ configvar CSI_PROW_E2E_ALPHA "$(get_versioned_variable CSI_PROW_E2E_ALPHA "${csi
339335
# kubernetes-csi components must be updated, either by disabling
340336
# the failing test for "latest" or by updating the test and not running
341337
# it anymore for older releases.
342-
configvar CSI_PROW_E2E_ALPHA_GATES_1_15 'VolumeSnapshotDataSource=true,ExpandCSIVolumes=true' "alpha feature gates for Kubernetes 1.15"
343-
configvar CSI_PROW_E2E_ALPHA_GATES_1_16 'VolumeSnapshotDataSource=true' "alpha feature gates for Kubernetes 1.16"
344338
# TODO: add new CSI_PROW_ALPHA_GATES_xxx entry for future Kubernetes releases and
345339
# add new gates to CSI_PROW_E2E_ALPHA_GATES_LATEST.
346340
configvar CSI_PROW_E2E_ALPHA_GATES_LATEST '' "alpha feature gates for latest Kubernetes"
347341
configvar CSI_PROW_E2E_ALPHA_GATES "$(get_versioned_variable CSI_PROW_E2E_ALPHA_GATES "${csi_prow_kubernetes_version_suffix}")" "alpha E2E feature gates"
348342

349343
# Which external-snapshotter tag to use for the snapshotter CRD and snapshot-controller deployment
350-
configvar CSI_SNAPSHOTTER_VERSION 'v2.0.1' "external-snapshotter version tag"
344+
configvar CSI_SNAPSHOTTER_VERSION 'v3.0.0' "external-snapshotter version tag"
351345

352346
# Some tests are known to be unusable in a KinD cluster. For example,
353347
# stopping kubelet with "ssh <node IP> systemctl stop kubelet" simply
@@ -718,7 +712,7 @@ install_csi_driver () {
718712
# Installs all nessesary snapshotter CRDs
719713
install_snapshot_crds() {
720714
# Wait until volumesnapshot CRDs are in place.
721-
CRD_BASE_DIR="https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/${CSI_SNAPSHOTTER_VERSION}/config/crd"
715+
CRD_BASE_DIR="https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/${CSI_SNAPSHOTTER_VERSION}/client/config/crd"
722716
kubectl apply -f "${CRD_BASE_DIR}/snapshot.storage.k8s.io_volumesnapshotclasses.yaml" --validate=false
723717
kubectl apply -f "${CRD_BASE_DIR}/snapshot.storage.k8s.io_volumesnapshots.yaml" --validate=false
724718
kubectl apply -f "${CRD_BASE_DIR}/snapshot.storage.k8s.io_volumesnapshotcontents.yaml" --validate=false
@@ -1101,14 +1095,8 @@ main () {
11011095
start_cluster || die "starting the non-alpha cluster failed"
11021096

11031097
# Install necessary snapshot CRDs and snapshot controller
1104-
# For Kubernetes 1.17+, we will install the CRDs and snapshot controller.
1105-
if version_gt "${CSI_PROW_KUBERNETES_VERSION}" "1.16.255" || "${CSI_PROW_KUBERNETES_VERSION}" == "latest"; then
1106-
info "Version ${CSI_PROW_KUBERNETES_VERSION}, installing CRDs and snapshot controller"
1107-
install_snapshot_crds
1108-
install_snapshot_controller
1109-
else
1110-
info "Version ${CSI_PROW_KUBERNETES_VERSION}, skipping CRDs and snapshot controller"
1111-
fi
1098+
install_snapshot_crds
1099+
install_snapshot_controller
11121100

11131101
# Installing the driver might be disabled.
11141102
if ${CSI_PROW_DRIVER_INSTALL} "$images"; then
@@ -1158,14 +1146,8 @@ main () {
11581146
start_cluster "${CSI_PROW_E2E_ALPHA_GATES}" || die "starting alpha cluster failed"
11591147

11601148
# Install necessary snapshot CRDs and snapshot controller
1161-
# For Kubernetes 1.17+, we will install the CRDs and snapshot controller.
1162-
if version_gt "${CSI_PROW_KUBERNETES_VERSION}" "1.16.255" || "${CSI_PROW_KUBERNETES_VERSION}" == "latest"; then
1163-
info "Version ${CSI_PROW_KUBERNETES_VERSION}, installing CRDs and snapshot controller"
1164-
install_snapshot_crds
1165-
install_snapshot_controller
1166-
else
1167-
info "Version ${CSI_PROW_KUBERNETES_VERSION}, skipping CRDs and snapshot controller"
1168-
fi
1149+
install_snapshot_crds
1150+
install_snapshot_controller
11691151

11701152
# Installing the driver might be disabled.
11711153
if ${CSI_PROW_DRIVER_INSTALL} "$images"; then

0 commit comments

Comments
 (0)