github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add an explicit KUBERNETES_MASTER variable to the kube-env.

Browse Source
This commit is contained in:
CJ Cullen 2015-05-27 14:47:12 -07:00
parent ac82f50afb
commit dcf5b16cea
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cluster/gce/configure-vm.sh
View File

@ -77,13 +77,6 @@ import pipes,sys,yaml
for k,v in yaml.load(sys.stdin).iteritems():
print "readonly {var}={value}".format(var = k, value = pipes.quote(str(v)))
''' < "${kube_env_yaml}")
# Infer master status from hostname
if [[ $(hostname) == "${INSTANCE_PREFIX}-master" ]]; then
KUBERNETES_MASTER="true"
else
KUBERNETES_MASTER="false"
fi
}
function remove-docker-artifacts() {

2
cluster/gce/coreos/helper.sh
View File

@ -25,6 +25,7 @@ function build-kube-env {
# TODO(dawnchen): master node is still running with debian image
if [[ "${master}" == "true" ]]; then
cat >$file <<EOF
KUBERNETES_MASTER: "true"
ENV_TIMESTAMP: $(yaml-quote $(date -u +%Y-%m-%dT%T%z))
INSTANCE_PREFIX: $(yaml-quote ${INSTANCE_PREFIX})
NODE_INSTANCE_PREFIX: $(yaml-quote ${NODE_INSTANCE_PREFIX})
@ -60,6 +61,7 @@ KUBECFG_KEY: $(yaml-quote ${KUBECFG_KEY_BASE64:-})
EOF
else
cat >>$file <<EOF
KUBERNETES_MASTER: "false"
ENV_TIMESTAMP=$(yaml-quote $(date -u +%Y-%m-%dT%T%z))
INSTANCE_PREFIX=$(yaml-quote ${INSTANCE_PREFIX})
NODE_INSTANCE_PREFIX=$(yaml-quote ${NODE_INSTANCE_PREFIX})

2
cluster/gce/debian/helper.sh
View File

@ -51,6 +51,7 @@ EOF
if [[ "${master}" == "true" ]]; then
# Master-only env vars.
cat >>$file <<EOF
KUBERNETES_MASTER: "true"
KUBE_USER: $(yaml-quote ${KUBE_USER})
KUBE_PASSWORD: $(yaml-quote ${KUBE_PASSWORD})
KUBE_BEARER_TOKEN: $(yaml-quote ${KUBE_BEARER_TOKEN})
@ -62,6 +63,7 @@ EOF
else
# Node-only env vars.
cat >>$file <<EOF
KUBERNETES_MASTER: "false"
KUBERNETES_MASTER_NAME: $(yaml-quote ${MASTER_NAME})
ZONE: $(yaml-quote ${ZONE})
EXTRA_DOCKER_OPTS: $(yaml-quote ${EXTRA_DOCKER_OPTS})