Fix not-ready master node after upgrade.

This commit is contained in:
Wojciech Tyczynski 2016-06-21 15:16:24 +02:00
parent ee28e1ebc3
commit e029f9523b

View File

@ -74,6 +74,7 @@ function upgrade-master() {
get-kubeconfig-bearertoken get-kubeconfig-bearertoken
detect-master detect-master
parse-master-env
# Delete the master instance. Note that the master-pd is created # Delete the master instance. Note that the master-pd is created
# with auto-delete=no, so it should not be deleted. # with auto-delete=no, so it should not be deleted.
@ -120,7 +121,6 @@ function prepare-upgrade() {
tars_from_version tars_from_version
} }
# Reads kube-env metadata from first node in NODE_NAMES. # Reads kube-env metadata from first node in NODE_NAMES.
# #
# Assumed vars: # Assumed vars:
@ -134,15 +134,6 @@ function get-node-env() {
'http://metadata/computeMetadata/v1/instance/attributes/kube-env'" 2>/dev/null '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: # Assumed vars:
# KUBE_VERSION # KUBE_VERSION
# NODE_SCOPES # NODE_SCOPES