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

Fix the scripts to default empty string if EXTRA_DOCKER_OPTS isn't set.

Browse Source
This commit is contained in:
Brendan Burns 2015-06-12 21:47:30 -07:00
parent 51b20b35e2
commit 2c59a3c4a4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,7 +84,7 @@ ADMISSION_CONTROL=$(yaml-quote ${ADMISSION_CONTROL:-})
MASTER_IP_RANGE=$(yaml-quote ${MASTER_IP_RANGE}) MASTER_IP_RANGE=$(yaml-quote ${MASTER_IP_RANGE})
KUBERNETES_MASTER_NAME=$(yaml-quote ${MASTER_NAME}) KUBERNETES_MASTER_NAME=$(yaml-quote ${MASTER_NAME})
ZONE=$(yaml-quote ${ZONE}) ZONE=$(yaml-quote ${ZONE})
EXTRA_DOCKER_OPTS=$(yaml-quote ${EXTRA_DOCKER_OPTS}) EXTRA_DOCKER_OPTS=$(yaml-quote ${EXTRA_DOCKER_OPTS:-})
ENABLE_DOCKER_REGISTRY_CACHE=$(yaml-quote ${ENABLE_DOCKER_REGISTRY_CACHE:-false}) ENABLE_DOCKER_REGISTRY_CACHE=$(yaml-quote ${ENABLE_DOCKER_REGISTRY_CACHE:-false})
PROJECT_ID=$(yaml-quote ${PROJECT}) PROJECT_ID=$(yaml-quote ${PROJECT})
KUBERNETES_CONTAINER_RUNTIME=$(yaml-quote ${CONTAINER_RUNTIME}) KUBERNETES_CONTAINER_RUNTIME=$(yaml-quote ${CONTAINER_RUNTIME})

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

@ -70,7 +70,7 @@ EOF
cat >>$file <<EOF cat >>$file <<EOF
KUBERNETES_MASTER: "false" KUBERNETES_MASTER: "false"
ZONE: $(yaml-quote ${ZONE}) ZONE: $(yaml-quote ${ZONE})
EXTRA_DOCKER_OPTS: $(yaml-quote ${EXTRA_DOCKER_OPTS}) EXTRA_DOCKER_OPTS: $(yaml-quote ${EXTRA_DOCKER_OPTS:-})
ENABLE_DOCKER_REGISTRY_CACHE: $(yaml-quote ${ENABLE_DOCKER_REGISTRY_CACHE:-false}) ENABLE_DOCKER_REGISTRY_CACHE: $(yaml-quote ${ENABLE_DOCKER_REGISTRY_CACHE:-false})
KUBELET_CERT: $(yaml-quote ${KUBELET_CERT_BASE64:-}) KUBELET_CERT: $(yaml-quote ${KUBELET_CERT_BASE64:-})
KUBELET_KEY: $(yaml-quote ${KUBELET_KEY_BASE64:-}) KUBELET_KEY: $(yaml-quote ${KUBELET_KEY_BASE64:-})