Skip to content

Commit 3948331

Browse files
committed
fix testing with latest Kubernetes
It failed for two reasons: - CSIDriver v1beta1 as used in csi-driver-host-path v1.3.0 is no longer supported. - GenericEphemeralVolume was removed in Kubernetes master.
1 parent e4dab7f commit 3948331

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

prow.sh

+7-3
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ kindest/node:v1.14.10@sha256:f8a66ef82822ab4f7569e91a5bccaf27bceee135c1457c512e5
196196
# If the deployment script is called with CSI_PROW_TEST_DRIVER=<file name> as
197197
# environment variable, then it must write a suitable test driver configuration
198198
# 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"
200200
configvar CSI_PROW_DRIVER_REPO https://github.com/kubernetes-csi/csi-driver-host-path "CSI driver repo"
201201
configvar CSI_PROW_DEPLOYMENT "" "deployment"
202202
configvar CSI_PROW_DEPLOYMENT_SUFFIX "" "additional suffix in kubernetes-x.yy[suffix].yaml files"
@@ -346,7 +346,7 @@ configvar CSI_PROW_E2E_ALPHA "$(get_versioned_variable CSI_PROW_E2E_ALPHA "${csi
346346
# kubernetes-csi components must be updated, either by disabling
347347
# the failing test for "latest" or by updating the test and not running
348348
# 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"
350350
configvar CSI_PROW_E2E_ALPHA_GATES "$(get_versioned_variable CSI_PROW_E2E_ALPHA_GATES "${csi_prow_kubernetes_version_suffix}")" "alpha E2E feature gates"
351351

352352
# Which external-snapshotter tag to use for the snapshotter CRD and snapshot-controller deployment
@@ -1304,7 +1304,11 @@ main () {
13041304
delete_cluster_inside_prow_job non-alpha
13051305
fi
13061306
1307-
if tests_need_alpha_cluster && [ "${CSI_PROW_E2E_ALPHA_GATES}" ]; then
1307+
# If the cluster for alpha tests doesn't need any feature gates, then we
1308+
# could reuse the same cluster as for the other tests. But that would make
1309+
# the flow in this script harder and wouldn't help in practice because
1310+
# we have separate Prow jobs for alpha and non-alpha tests.
1311+
if tests_need_alpha_cluster; then
13081312
# Need to (re)create the cluster.
13091313
start_cluster "${CSI_PROW_E2E_ALPHA_GATES}" || die "starting alpha cluster failed"
13101314

0 commit comments

Comments
 (0)