Skip to content

Commit e859ece

Browse files
author
Mario Valderrama
committed
release-tools: update
2 parents 6bfe740 + 097d0ff commit e859ece

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

release-tools/prow.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ kindest/node:v1.18.20@sha256:738cdc23ed4be6cc0b7ea277a2ebcc454c8373d7d8fb991a7fc
199199
# If the deployment script is called with CSI_PROW_TEST_DRIVER=<file name> as
200200
# environment variable, then it must write a suitable test driver configuration
201201
# into that file in addition to installing the driver.
202-
configvar CSI_PROW_DRIVER_VERSION "v1.12.0" "CSI driver version"
202+
configvar CSI_PROW_DRIVER_VERSION "v1.15.0" "CSI driver version"
203203
configvar CSI_PROW_DRIVER_REPO https://github.com/kubernetes-csi/csi-driver-host-path "CSI driver repo"
204204
configvar CSI_PROW_DEPLOYMENT "" "deployment"
205205
configvar CSI_PROW_DEPLOYMENT_SUFFIX "" "additional suffix in kubernetes-x.yy[suffix].yaml files"
@@ -441,7 +441,8 @@ run_with_go () {
441441
else
442442
version=local
443443
fi
444-
GOTOOLCHAIN=$version run "$@"
444+
# Set GOMODCACHE to make sure Kubernetes does not need to download again.
445+
GOTOOLCHAIN=$version GOMODCACHE="$(go env GOMODCACHE)" run "$@"
445446
}
446447

447448
# Ensure that we have the desired version of kind.
@@ -624,7 +625,7 @@ start_cluster () {
624625
go_version="$(go_version_for_kubernetes "${CSI_PROW_WORK}/src/kubernetes" "$version")" || die "cannot proceed without knowing Go version for Kubernetes"
625626
# Changing into the Kubernetes source code directory is a workaround for https://github.com/kubernetes-sigs/kind/issues/1910
626627
# shellcheck disable=SC2046
627-
(cd "${CSI_PROW_WORK}/src/kubernetes" && run_with_go "$go_version" kind build node-image --image csiprow/node:latest --kube-root "${CSI_PROW_WORK}/src/kubernetes") || die "'kind build node-image' failed"
628+
(cd "${CSI_PROW_WORK}/src/kubernetes" && run_with_go "$go_version" kind build node-image "${CSI_PROW_WORK}/src/kubernetes" --image csiprow/node:latest) || die "'kind build node-image' failed"
628629
csi_prow_kind_have_kubernetes=true
629630
fi
630631
image="csiprow/node:latest"

0 commit comments

Comments
 (0)