From 0b3cf3f5cfa6b86a26879d25eb9122c693463ed7 Mon Sep 17 00:00:00 2001 From: Marcin Date: Tue, 21 Jun 2016 14:07:37 +0200 Subject: [PATCH] Fix for unbounded KUBE_MANIFEST variables in upgarde.sh --- cluster/common.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cluster/common.sh b/cluster/common.sh index fbf8f3f8c19..6b677575c25 100755 --- a/cluster/common.sh +++ b/cluster/common.sh @@ -328,9 +328,15 @@ function tars_from_version() { elif [[ ${KUBE_VERSION} =~ ${KUBE_RELEASE_VERSION_REGEX} ]]; then SERVER_BINARY_TAR_URL="https://storage.googleapis.com/kubernetes-release/release/${KUBE_VERSION}/kubernetes-server-linux-amd64.tar.gz" SALT_TAR_URL="https://storage.googleapis.com/kubernetes-release/release/${KUBE_VERSION}/kubernetes-salt.tar.gz" + # TODO: Clean this up. + KUBE_MANIFESTS_TAR_URL="${SERVER_BINARY_TAR_URL/server-linux-amd64/manifests}" + KUBE_MANIFESTS_TAR_HASH=$(curl ${KUBE_MANIFESTS_TAR_URL} | sha1sum | awk '{print $1}') elif [[ ${KUBE_VERSION} =~ ${KUBE_CI_VERSION_REGEX} ]]; then SERVER_BINARY_TAR_URL="https://storage.googleapis.com/kubernetes-release/ci/${KUBE_VERSION}/kubernetes-server-linux-amd64.tar.gz" SALT_TAR_URL="https://storage.googleapis.com/kubernetes-release/ci/${KUBE_VERSION}/kubernetes-salt.tar.gz" + # TODO: Clean this up. + KUBE_MANIFESTS_TAR_URL="${SERVER_BINARY_TAR_URL/server-linux-amd64/manifests}" + KUBE_MANIFESTS_TAR_HASH=$(curl ${KUBE_MANIFESTS_TAR_URL} | sha1sum | awk '{print $1}') else echo "Version doesn't match regexp" >&2 exit 1