Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Automated cherry pick of #27846 #28347

Merged
merged 1 commit into from
Jul 1, 2016
Merged

Automated cherry pick of #27846 #28347

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 1 addition & 10 deletions cluster/gce/upgrade.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ function upgrade-master() {
get-kubeconfig-bearertoken

detect-master
parse-master-env

# Delete the master instance. Note that the master-pd is created
# with auto-delete=no, so it should not be deleted.
Expand Down Expand Up @@ -121,7 +122,6 @@ function prepare-upgrade() {
tars_from_version
}


# Reads kube-env metadata from first node in NODE_NAMES.
#
# Assumed vars:
Expand All @@ -135,15 +135,6 @@ function get-node-env() {
'http://metadata/computeMetadata/v1/instance/attributes/kube-env'" 2>/dev/null
}

# Using provided node env, extracts value from provided key.
#
# Args:
# $1 node env (kube-env of node; result of calling get-node-env)
# $2 env key to use
function get-env-val() {
echo "${1}" | grep ${2} | cut -d : -f 2 | cut -d \' -f 2
}

# Assumed vars:
# KUBE_VERSION
# NODE_SCOPES
Expand Down