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

Merge pull request #73822 from justinsb/renamed_set_node_image 

e2e upgrade test: rename functions to match f0f7829934
pull/564/head
Kubernetes Prow Robot 2019-02-13 19:06:20 -08:00 committed by GitHub
parent a3877b1776 28c34d8d71
commit 6f6f8bdfcc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cluster/gce/upgrade.sh
View File

@ -213,7 +213,7 @@ function setup-base-image() {
source "${KUBE_ROOT}/cluster/gce/${NODE_OS_DISTRIBUTION}/node-helper.sh" source "${KUBE_ROOT}/cluster/gce/${NODE_OS_DISTRIBUTION}/node-helper.sh"
# Reset the node image based on current os distro # Reset the node image based on current os distro
set-node-image set-linux-node-image
fi fi
} }
@ -263,12 +263,12 @@ function prepare-node-upgrade() {
# TODO(zmerlynn): How do we ensure kube-env is written in a ${version}- # TODO(zmerlynn): How do we ensure kube-env is written in a ${version}-
# compatible way? # compatible way?
write-node-env write-linux-node-env
# TODO(zmerlynn): Get configure-vm script from ${version}. (Must plumb this # TODO(zmerlynn): Get configure-vm script from ${version}. (Must plumb this
# through all create-node-instance-template implementations). # through all create-linux-node-instance-template implementations).
local template_name=$(get-template-name-from-version ${SANITIZED_VERSION}) local template_name=$(get-template-name-from-version ${SANITIZED_VERSION})
create-node-instance-template "${template_name}" create-linux-node-instance-template "${template_name}"
# The following is echo'd so that callers can get the template name. # The following is echo'd so that callers can get the template name.
echo "Instance template name: ${template_name}" echo "Instance template name: ${template_name}"
echo "== Finished preparing node upgrade (to ${KUBE_VERSION}). ==" >&2 echo "== Finished preparing node upgrade (to ${KUBE_VERSION}). ==" >&2