Skip to content

Commit 9e4dc73

Browse files
committed
introduce control variable for non alpha feature gate configuration
Some of the CSI components may need to tweak the by default enabled feature gates for latest clusters for their operations. This configuration knob helps them for controlling it. Signed-off-by: Humble Chirammal <[email protected]>
1 parent ca19ef5 commit 9e4dc73

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

prow.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,9 @@ configvar CSI_PROW_E2E_ALPHA "$(get_versioned_variable CSI_PROW_E2E_ALPHA "${csi
349349
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

352+
configvar CSI_PROW_E2E_GATES_LATEST '' "non alpha feature gates for latest kubernetes"
353+
configvar CSI_PROW_E2E_GATES_LATEST "$(get_versioned_variable CSI_PROW_E2E_GATES_LATEST "${csi_prow_kubernetes_version_suffix}")" "non alpha E2E feature gates"
354+
352355
# Which external-snapshotter tag to use for the snapshotter CRD and snapshot-controller deployment
353356
default_csi_snapshotter_version () {
354357
if [ "${CSI_PROW_KUBERNETES_VERSION}" = "latest" ] || [ "${CSI_PROW_DRIVER_CANARY}" = "canary" ]; then
@@ -1253,8 +1256,9 @@ main () {
12531256
focus="($focus|CSI.mock.volume)"
12541257
fi
12551258
1256-
if tests_need_non_alpha_cluster; then
1257-
start_cluster || die "starting the non-alpha cluster failed"
1259+
if tests_need_non_alpha_cluster && [ "${CSI_PROW_E2E_GATES_LATEST}" ]; then
1260+
# Need to (re)create the cluster.
1261+
start_cluster "${CSI_PROW_E2E_GATES_LATEST}" || die "starting the non-alpha cluster failed"
12581262
12591263
# Install necessary snapshot CRDs and snapshot controller
12601264
install_snapshot_crds

0 commit comments

Comments
 (0)