Skip to content

Commit

Permalink
DO NOT MERGE: get kind fix for Kubernetes master image building
Browse files Browse the repository at this point in the history
  • Loading branch information
msau42 committed Jul 23, 2019
1 parent 4b2c735 commit 29891b4
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions release-tools/prow.sh
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ configvar CSI_PROW_GO_VERSION_GINKGO "${CSI_PROW_GO_VERSION_BUILD}" "Go version
# kind version to use. If the pre-installed version is different,
# the desired version is downloaded from https://github.com/kubernetes-sigs/kind/releases/download/
# (if available), otherwise it is built from source.
configvar CSI_PROW_KIND_VERSION v0.4.0 "kind"
configvar CSI_PROW_KIND_VERSION 13052462357bd006f3f25e3c3c88b400d65ba173 "kind"

# ginkgo test runner version to use. If the pre-installed version is
# different, the desired version is built from source.
Expand Down Expand Up @@ -380,7 +380,11 @@ install_kind () {
chmod u+x "${CSI_PROW_WORK}/bin/kind"
else
git_checkout https://github.com/kubernetes-sigs/kind "$GOPATH/src/sigs.k8s.io/kind" "${CSI_PROW_KIND_VERSION}" --depth=1 &&
run_with_go "${CSI_PROW_GO_VERSION_KIND}" go build -o "${CSI_PROW_WORK}/bin/kind" sigs.k8s.io/kind
if [ -d "$GOPATH/src/sigs.k8s.io/kind/vendor" ]; then
run_with_go "${CSI_PROW_GO_VERSION_KIND}" go build -o "${CSI_PROW_WORK}/bin/kind" sigs.k8s.io/kind;
else
(cd "$GOPATH/src/sigs.k8s.io/kind" && run_with_go "${CSI_PROW_GO_VERSION_KIND}" env GO111MODULE=on);
fi
fi
}

Expand Down

0 comments on commit 29891b4

Please sign in to comment.