Merge pull request #27824 from andyzheng0831/upgrade

Fix the node upgrade failure issue #27764
pull/6/head
Marek Grabowski 2016-06-22 07:32:35 +02:00 committed by GitHub
commit 95d492603d
1 changed files with 4 additions and 0 deletions

View File

@ -211,6 +211,10 @@ function prepare-node-upgrade() {
# TODO(zmerlynn): Get configure-vm script from ${version}. (Must plumb this
# through all create-node-instance-template implementations).
local template_name=$(get-template-name-from-version ${SANITIZED_VERSION})
# For master on GCI, we support the hybrid mode with nodes on ContainerVM.
if [[ "${OS_DISTRIBUTION}" == "gci" && "${NODE_IMAGE}" == container* ]]; then
source "${KUBE_ROOT}/cluster/gce/debian/helper.sh"
fi
create-node-instance-template "${template_name}"
# The following is echo'd so that callers can get the template name.
echo $template_name