github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.

pull/6/head
Jing Ai 2018-01-18 17:51:06 -08:00
parent dba2b58202
commit 06378ce0f0
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/gce/upgrade-aliases.sh
View File

@ -83,7 +83,9 @@ function set-allow-subnet-cidr-routes-overlap() {
--format='value(fingerprint)') --format='value(fingerprint)')
local access_token=$(gcloud auth print-access-token) local access_token=$(gcloud auth print-access-token)
local request="{\"allowSubnetCidrRoutesOverlap\":$1, \"fingerprint\":\"${fingerprint}\"}" 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}" \ until curl -s --header "Content-Type: application/json" --header "Authorization: Bearer ${access_token}" \
-X PATCH -d "${request}" "${subnetwork_url}" --output /dev/null; do -X PATCH -d "${request}" "${subnetwork_url}" --output /dev/null; do
printf "." printf "."
@ -161,6 +163,8 @@ export KUBE_GCE_ENABLE_IP_ALIASES=true
export SECONDARY_RANGE_NAME="pods-default" export SECONDARY_RANGE_NAME="pods-default"
export STORAGE_BACKEND="etcd3" export STORAGE_BACKEND="etcd3"
export STORAGE_MEDIA_TYPE="application/vnd.kubernetes.protobuf" 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 # Upgrade master with updated kube envs
${KUBE_ROOT}/cluster/gce/upgrade.sh -M -l ${KUBE_ROOT}/cluster/gce/upgrade.sh -M -l