Skip to content

Commit 6f79cfe

Browse files
committed
Squashed 'release-tools/' changes from e4dab7f..ab0b0a3
kubernetes-csi/csi-release-tools@ab0b0a3d Merge kubernetes-csi/csi-release-tools#192 from andyzhangx/patch-1 kubernetes-csi/csi-release-tools@7bbab24e Merge kubernetes-csi/csi-release-tools#196 from humblec/non-alpha kubernetes-csi/csi-release-tools@e51ff2cc introduce control variable for non alpha feature gate configuration kubernetes-csi/csi-release-tools@ca19ef52 Merge kubernetes-csi/csi-release-tools#195 from pohly/fix-alpha-testing kubernetes-csi/csi-release-tools@3948331e fix testing with latest Kubernetes kubernetes-csi/csi-release-tools@9a0260c5 fix boilerplate header git-subtree-dir: release-tools git-subtree-split: ab0b0a3
1 parent 9ec8f15 commit 6f79cfe

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

go-get-kubernetes.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
16-
#
16+
1717
# This script can be used while converting a repo from "dep" to "go mod"
1818
# by calling it after "go mod init" or to update the Kubernetes packages
1919
# in a repo that has already been converted. Only packages that are

prow.sh

+12-4
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,9 +346,12 @@ 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

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+
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
@@ -1254,7 +1257,8 @@ main () {
12541257
fi
12551258
12561259
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"
12581262
12591263
# Install necessary snapshot CRDs and snapshot controller
12601264
install_snapshot_crds
@@ -1304,7 +1308,11 @@ main () {
13041308
delete_cluster_inside_prow_job non-alpha
13051309
fi
13061310
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
13081316
# Need to (re)create the cluster.
13091317
start_cluster "${CSI_PROW_E2E_ALPHA_GATES}" || die "starting alpha cluster failed"
13101318

0 commit comments

Comments
 (0)