Skip to content

Commit

Permalink
prow.sh: fix installing Go for Kubernetes 1.19.0
Browse files Browse the repository at this point in the history
Kubernetes 1.19.0 uses Go 1.15, but refers to it as 1.15.0. This broke
both the check whether we need to install 1.15 (because "go version"
reports 1.15, which didn't match 1.15.0) and then downloading the
release archive (because the URL also only uses 1.15).
  • Loading branch information
pohly committed Aug 14, 2020
1 parent 1fbb636 commit 3b4a2f1
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions prow.sh
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,10 @@ go_version_for_kubernetes () (
if ! [ "$go_version" ]; then
die "Unable to determine Go version for Kubernetes $version from hack/lib/golang.sh."
fi
# Strip the trailing .0. Kubernetes includes it, Go itself doesn't.
# Ignore: See if you can use ${variable//search/replace} instead.
# shellcheck disable=SC2001
go_version="$(echo "$go_version" | sed -e 's/\.0$//')"
echo "$go_version"
)

Expand Down

0 comments on commit 3b4a2f1

Please sign in to comment.