Trusty: Support hybrid cluster with nodes on ContainerVM

2ea9ef53 · Andy Zheng · b56252e3 · 2ea9ef53
Commit 2ea9ef53 authored Mar 16, 2016 by Andy Zheng
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

util.sh cluster/gce/util.sh +5 -0

No files found.
--- a/cluster/gce/util.sh
+++ b/cluster/gce/util.sh
@@ -689,6 +689,11 @@ function create-nodes-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
 }