Skip to content

Commit 3af6d51

Browse files
committed
DO NOT MERGE: get kind fix for Kubernetes master image building
1 parent 4b2c735 commit 3af6d51

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

release-tools/prow.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ configvar CSI_PROW_GO_VERSION_GINKGO "${CSI_PROW_GO_VERSION_BUILD}" "Go version
101101
# kind version to use. If the pre-installed version is different,
102102
# the desired version is downloaded from https://github.com/kubernetes-sigs/kind/releases/download/
103103
# (if available), otherwise it is built from source.
104-
configvar CSI_PROW_KIND_VERSION v0.4.0 "kind"
104+
configvar CSI_PROW_KIND_VERSION 13052462357bd006f3f25e3c3c88b400d65ba173 "kind"
105105

106106
# ginkgo test runner version to use. If the pre-installed version is
107107
# different, the desired version is built from source.
@@ -380,7 +380,11 @@ install_kind () {
380380
chmod u+x "${CSI_PROW_WORK}/bin/kind"
381381
else
382382
git_checkout https://github.com/kubernetes-sigs/kind "$GOPATH/src/sigs.k8s.io/kind" "${CSI_PROW_KIND_VERSION}" --depth=1 &&
383-
run_with_go "${CSI_PROW_GO_VERSION_KIND}" go build -o "${CSI_PROW_WORK}/bin/kind" sigs.k8s.io/kind
383+
if [ -d "$GOPATH/src/sigs.k8s.io/kind/vendor" ]; then
384+
run_with_go "${CSI_PROW_GO_VERSION_KIND}" go build -o "${CSI_PROW_WORK}/bin/kind" sigs.k8s.io/kind;
385+
else
386+
(cd "$CSI_PROW_WORK/kind" && run_with_go "${CSI_PROW_GO_VERSION_KIND}" go build -o "${CSI_PROW_WORK}/bin/kind" .)
387+
fi
384388
fi
385389
}
386390

0 commit comments

Comments
 (0)