@@ -196,7 +196,7 @@ kindest/node:v1.14.10@sha256:f8a66ef82822ab4f7569e91a5bccaf27bceee135c1457c512e5
196
196
# If the deployment script is called with CSI_PROW_TEST_DRIVER=<file name> as
197
197
# environment variable, then it must write a suitable test driver configuration
198
198
# into that file in addition to installing the driver.
199
- configvar CSI_PROW_DRIVER_VERSION " v1.3 .0" " CSI driver version"
199
+ configvar CSI_PROW_DRIVER_VERSION " v1.8 .0" " CSI driver version"
200
200
configvar CSI_PROW_DRIVER_REPO https://github.com/kubernetes-csi/csi-driver-host-path " CSI driver repo"
201
201
configvar CSI_PROW_DEPLOYMENT " " " deployment"
202
202
configvar CSI_PROW_DEPLOYMENT_SUFFIX " " " additional suffix in kubernetes-x.yy[suffix].yaml files"
@@ -346,9 +346,12 @@ configvar CSI_PROW_E2E_ALPHA "$(get_versioned_variable CSI_PROW_E2E_ALPHA "${csi
346
346
# kubernetes-csi components must be updated, either by disabling
347
347
# the failing test for "latest" or by updating the test and not running
348
348
# it anymore for older releases.
349
- configvar CSI_PROW_E2E_ALPHA_GATES_LATEST ' GenericEphemeralVolume=true,CSIStorageCapacity=true ' " alpha feature gates for latest Kubernetes"
349
+ configvar CSI_PROW_E2E_ALPHA_GATES_LATEST ' ' " alpha feature gates for latest Kubernetes"
350
350
configvar CSI_PROW_E2E_ALPHA_GATES " $( get_versioned_variable CSI_PROW_E2E_ALPHA_GATES " ${csi_prow_kubernetes_version_suffix} " ) " " alpha E2E feature gates"
351
351
352
+ configvar CSI_PROW_E2E_GATES_LATEST ' ' " non alpha feature gates for latest Kubernetes"
353
+ configvar CSI_PROW_E2E_GATES " $( get_versioned_variable CSI_PROW_E2E_GATES " ${csi_prow_kubernetes_version_suffix} " ) " " non alpha E2E feature gates"
354
+
352
355
# Which external-snapshotter tag to use for the snapshotter CRD and snapshot-controller deployment
353
356
default_csi_snapshotter_version () {
354
357
if [ " ${CSI_PROW_KUBERNETES_VERSION} " = " latest" ] || [ " ${CSI_PROW_DRIVER_CANARY} " = " canary" ]; then
@@ -1254,7 +1257,8 @@ main () {
1254
1257
fi
1255
1258
1256
1259
if tests_need_non_alpha_cluster; then
1257
- start_cluster || die " starting the non-alpha cluster failed"
1260
+ # Need to (re)create the cluster.
1261
+ start_cluster " ${CSI_PROW_E2E_GATES} " || die " starting the non-alpha cluster failed"
1258
1262
1259
1263
# Install necessary snapshot CRDs and snapshot controller
1260
1264
install_snapshot_crds
@@ -1304,7 +1308,11 @@ main () {
1304
1308
delete_cluster_inside_prow_job non-alpha
1305
1309
fi
1306
1310
1307
- if tests_need_alpha_cluster && [ " ${CSI_PROW_E2E_ALPHA_GATES} " ]; then
1311
+ # If the cluster for alpha tests doesn't need any feature gates, then we
1312
+ # could reuse the same cluster as for the other tests. But that would make
1313
+ # the flow in this script harder and wouldn't help in practice because
1314
+ # we have separate Prow jobs for alpha and non-alpha tests.
1315
+ if tests_need_alpha_cluster; then
1308
1316
# Need to (re)create the cluster.
1309
1317
start_cluster " ${CSI_PROW_E2E_ALPHA_GATES} " || die " starting alpha cluster failed"
1310
1318
0 commit comments