From 06378ce0f0653b807f0c35cb04e2f0b869bee221 Mon Sep 17 00:00:00 2001 From: Jing Ai Date: Thu, 18 Jan 2018 17:51:06 -0800 Subject: [PATCH] A couple of minior changes: a) fetch the subnetwork url from subnets describe command rather than compose it from env vars; b) explicit specify etcd version env vars before running upgrade.sh to avoid prompt. --- cluster/gce/upgrade-aliases.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cluster/gce/upgrade-aliases.sh b/cluster/gce/upgrade-aliases.sh index b5da11dc6ce..a58498de1eb 100755 --- a/cluster/gce/upgrade-aliases.sh +++ b/cluster/gce/upgrade-aliases.sh @@ -83,7 +83,9 @@ function set-allow-subnet-cidr-routes-overlap() { --format='value(fingerprint)') local access_token=$(gcloud auth print-access-token) local request="{\"allowSubnetCidrRoutesOverlap\":$1, \"fingerprint\":\"${fingerprint}\"}" - local subnetwork_url="${GCE_API_ENDPOINT}projects/${PROJECT}/regions/${REGION}/subnetworks/${IP_ALIAS_SUBNETWORK}" + local subnetwork_url=$(gcloud beta compute networks subnets describe \ + ${IP_ALIAS_SUBNETWORK} --project=${PROJECT} --region=${REGION} \ + --format='value(selfLink)') until curl -s --header "Content-Type: application/json" --header "Authorization: Bearer ${access_token}" \ -X PATCH -d "${request}" "${subnetwork_url}" --output /dev/null; do printf "." @@ -161,6 +163,8 @@ export KUBE_GCE_ENABLE_IP_ALIASES=true export SECONDARY_RANGE_NAME="pods-default" export STORAGE_BACKEND="etcd3" export STORAGE_MEDIA_TYPE="application/vnd.kubernetes.protobuf" +export ETCD_IMAGE=3.0.17 +export ETCD_VERSION=3.0.17 # Upgrade master with updated kube envs ${KUBE_ROOT}/cluster/gce/upgrade.sh -M -l