Skip to content

Commit f6c8173

Browse files
committed
Squashed 'release-tools/' changes from a6a1a79..4aedf35
4aedf35 Merge pull request kubernetes-csi#178 from xing-yang/timeout 2b9897e Increase build timeout 51d3702 Merge pull request kubernetes-csi#177 from mauriciopoppe/kind-image-1.23 a30efea Add kind image for 1.23 git-subtree-dir: release-tools git-subtree-split: 4aedf35
1 parent 241c202 commit f6c8173

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

cloudbuild.yaml

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@
1616
# To promote release images, see https://github.com/kubernetes/k8s.io/tree/HEAD/k8s.gcr.io/images/k8s-staging-sig-storage.
1717

1818
# This must be specified in seconds. If omitted, defaults to 600s (10 mins).
19-
# Building three images in external-snapshotter takes roughly half an hour,
20-
# sometimes more.
21-
timeout: 3600s
19+
# Building three images in external-snapshotter takes more than an hour.
20+
timeout: 7200s
2221
# This prevents errors if you don't use both _GIT_TAG and _PULL_BASE_REF,
2322
# or any new substitutions added in the future.
2423
options:

prow.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,8 @@ configvar CSI_PROW_KIND_VERSION "$(kind_version_default)" "kind"
149149

150150
# kind images to use. Must match the kind version.
151151
# The release notes of each kind release list the supported images.
152-
configvar CSI_PROW_KIND_IMAGES "kindest/node:v1.22.0@sha256:b8bda84bb3a190e6e028b1760d277454a72267a5454b57db34437c34a588d047
152+
configvar CSI_PROW_KIND_IMAGES "kindest/node:v1.23.0@sha256:49824ab1727c04e56a21a5d8372a402fcd32ea51ac96a2706a12af38934f81ac
153+
kindest/node:v1.22.0@sha256:b8bda84bb3a190e6e028b1760d277454a72267a5454b57db34437c34a588d047
153154
kindest/node:v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6
154155
kindest/node:v1.20.7@sha256:cbeaf907fc78ac97ce7b625e4bf0de16e3ea725daf6b04f930bd14c67c671ff9
155156
kindest/node:v1.19.11@sha256:07db187ae84b4b7de440a73886f008cf903fcf5764ba8106a9fd5243d6f32729

0 commit comments

Comments
 (0)