From 4b309aa8644dd3932ef2dfdd4e570c1dc313669a Mon Sep 17 00:00:00 2001
From: Eric Paris <eparis@redhat.com>
Date: Thu, 5 Feb 2015 11:36:55 -0500
Subject: [PATCH] Do not use {} in systemd environment variables

From the systemd man page:
 Use "${FOO}" as part of a word, or as a word of its own, on the command
 line, in which case it will be
 replaced by the value of the environment variable including
 all whitespace it contains, resulting in a single argument.
 Use "$FOO" as a separate word on the
 command line, in which case it will be replaced
 by the value of the environment variable split at
 whitespace, resulting in zero or more arguments.

Since we want people to be able to use these for multiple arguments we
need to make sure we don't use {} around the env vars...
---
 contrib/init/systemd/kube-apiserver.service    | 18 +++++++++---------
 .../systemd/kube-controller-manager.service    | 10 +++++-----
 contrib/init/systemd/kube-proxy.service        |  8 ++++----
 contrib/init/systemd/kube-scheduler.service    |  8 ++++----
 contrib/init/systemd/kubelet.service           | 16 ++++++++--------
 5 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/contrib/init/systemd/kube-apiserver.service b/contrib/init/systemd/kube-apiserver.service
index eef9fbf96fa..7d947fe9cae 100644
--- a/contrib/init/systemd/kube-apiserver.service
+++ b/contrib/init/systemd/kube-apiserver.service
@@ -7,15 +7,15 @@ EnvironmentFile=-/etc/kubernetes/config
 EnvironmentFile=-/etc/kubernetes/apiserver
 User=kube
 ExecStart=/usr/bin/kube-apiserver \
-	    ${KUBE_LOGTOSTDERR} \
-	    ${KUBE_LOG_LEVEL} \
-	    ${KUBE_ETCD_SERVERS} \
-	    ${KUBE_API_ADDRESS} \
-	    ${KUBE_API_PORT} \
-	    ${KUBELET_PORT} \
-	    ${KUBE_ALLOW_PRIV} \
-	    ${KUBE_SERVICE_ADDRESSES} \
-	    ${KUBE_API_ARGS}
+	    $KUBE_LOGTOSTDERR \
+	    $KUBE_LOG_LEVEL \
+	    $KUBE_ETCD_SERVERS \
+	    $KUBE_API_ADDRESS \
+	    $KUBE_API_PORT \
+	    $KUBELET_PORT \
+	    $KUBE_ALLOW_PRIV \
+	    $KUBE_SERVICE_ADDRESSES \
+	    $KUBE_API_ARGS
 Restart=on-failure
 
 [Install]
diff --git a/contrib/init/systemd/kube-controller-manager.service b/contrib/init/systemd/kube-controller-manager.service
index 14d5ee5825d..872115c4f97 100644
--- a/contrib/init/systemd/kube-controller-manager.service
+++ b/contrib/init/systemd/kube-controller-manager.service
@@ -8,11 +8,11 @@ EnvironmentFile=-/etc/kubernetes/apiserver
 EnvironmentFile=-/etc/kubernetes/controller-manager
 User=kube
 ExecStart=/usr/bin/kube-controller-manager \
-	    ${KUBE_LOGTOSTDERR} \
-	    ${KUBE_LOG_LEVEL} \
-	    ${KUBELET_ADDRESSES} \
-	    ${KUBE_MASTER} \
-	    ${KUBE_CONTROLLER_MANAGER_ARGS}
+	    $KUBE_LOGTOSTDERR \
+	    $KUBE_LOG_LEVEL \
+	    $KUBELET_ADDRESSES \
+	    $KUBE_MASTER \
+	    $KUBE_CONTROLLER_MANAGER_ARGS
 Restart=on-failure
 
 [Install]
diff --git a/contrib/init/systemd/kube-proxy.service b/contrib/init/systemd/kube-proxy.service
index fcfc2e276c0..921f4ceee33 100644
--- a/contrib/init/systemd/kube-proxy.service
+++ b/contrib/init/systemd/kube-proxy.service
@@ -6,10 +6,10 @@ Documentation=https://github.com/GoogleCloudPlatform/kubernetes
 EnvironmentFile=-/etc/kubernetes/config
 EnvironmentFile=-/etc/kubernetes/proxy
 ExecStart=/usr/bin/kube-proxy \
-	    ${KUBE_LOGTOSTDERR} \
-	    ${KUBE_LOG_LEVEL} \
-	    ${KUBE_ETCD_SERVERS} \
-	    ${KUBE_PROXY_ARGS}
+	    $KUBE_LOGTOSTDERR \
+	    $KUBE_LOG_LEVEL \
+	    $KUBE_ETCD_SERVERS \
+	    $KUBE_PROXY_ARGS
 Restart=on-failure
 
 [Install]
diff --git a/contrib/init/systemd/kube-scheduler.service b/contrib/init/systemd/kube-scheduler.service
index 7ca88417e8f..f04666ebf7f 100644
--- a/contrib/init/systemd/kube-scheduler.service
+++ b/contrib/init/systemd/kube-scheduler.service
@@ -8,10 +8,10 @@ EnvironmentFile=-/etc/kubernetes/apiserver
 EnvironmentFile=-/etc/kubernetes/scheduler
 User=kube
 ExecStart=/usr/bin/kube-scheduler \
-	    ${KUBE_LOGTOSTDERR} \
-	    ${KUBE_LOG_LEVEL} \
-	    ${KUBE_MASTER} \
-	    ${KUBE_SCHEDULER_ARGS}
+	    $KUBE_LOGTOSTDERR \
+	    $KUBE_LOG_LEVEL \
+	    $KUBE_MASTER \
+	    $KUBE_SCHEDULER_ARGS
 Restart=on-failure
 
 [Install]
diff --git a/contrib/init/systemd/kubelet.service b/contrib/init/systemd/kubelet.service
index 973db5b608e..9c43f50ef1c 100644
--- a/contrib/init/systemd/kubelet.service
+++ b/contrib/init/systemd/kubelet.service
@@ -9,14 +9,14 @@ WorkingDirectory=/var/lib/kubelet
 EnvironmentFile=-/etc/kubernetes/config
 EnvironmentFile=-/etc/kubernetes/kubelet
 ExecStart=/usr/bin/kubelet \
-	    ${KUBE_LOGTOSTDERR} \
-	    ${KUBE_LOG_LEVEL} \
-	    ${KUBE_ETCD_SERVERS} \
-	    ${KUBELET_ADDRESS} \
-	    ${KUBELET_PORT} \
-	    ${KUBELET_HOSTNAME} \
-	    ${KUBE_ALLOW_PRIV} \
-	    ${KUBELET_ARGS}
+	    $KUBE_LOGTOSTDERR \
+	    $KUBE_LOG_LEVEL \
+	    $KUBE_ETCD_SERVERS \
+	    $KUBELET_ADDRESS \
+	    $KUBELET_PORT \
+	    $KUBELET_HOSTNAME \
+	    $KUBE_ALLOW_PRIV \
+	    $KUBELET_ARGS
 Restart=on-failure
 
 [Install]