GCE bring-up: Differentiate NODE_TAGS from NODE_INSTANCE_PREFIX

Kubernetes-side fix to #29074 (GKE-side fix necessary as well)
This commit is contained in:
Zach Loafman
2016-07-18 14:20:45 -07:00
parent 6108725869
commit 4c667c38c9
5 changed files with 21 additions and 3 deletions

View File

@@ -189,8 +189,13 @@ EOF
fi
if [[ -n "${NODE_INSTANCE_PREFIX:-}" ]]; then
use_cloud_config="true"
if [[ -n "${NODE_TAGS:-}" ]]; then
local -r node_tags="${NODE_TAGS}"
else
local -r node_tags="${NODE_INSTANCE_PREFIX}"
fi
cat <<EOF >>/etc/gce.conf
node-tags = ${NODE_INSTANCE_PREFIX}
node-tags = ${node_tags}
node-instance-prefix = ${NODE_INSTANCE_PREFIX}
EOF
fi