Skip to content

K
k3s
Commit d5316c21 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #23079 from andyzheng0831/hybrid

Auto commit by PR queue bot
parents b56252e3 2ea9ef53
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
cluster/gce/util.sh
View file @ d5316c21
...@@ -689,6 +689,11 @@ function create-nodes-template() { ...@@ -689,6 +689,11 @@ function create-nodes-template() {
local template_name="${NODE_INSTANCE_PREFIX}-template" local template_name="${NODE_INSTANCE_PREFIX}-template"
# For master on trusty, we support running nodes on ContainerVM or trusty.
if [[ "${OS_DISTRIBUTION}" == "trusty" ]] && \
[[ "${NODE_IMAGE}" == container* ]]; then
source "${KUBE_ROOT}/cluster/gce/debian/helper.sh"
fi
create-node-instance-template $template_name create-node-instance-template $template_name
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment