Fix a bunch of places where the -machines flag was still attached to the apiserver.

contrib/init/systemd/environ/apiserver

@@ -13,9 +13,6 @@ KUBE_API_PORT="--port=8080"
 # How the replication controller and scheduler find the apiserver
 KUBE_MASTER="--master=127.0.0.1:8080"
 
-# Comma seperated list of minions
-KUBELET_ADDRESSES="--machines=127.0.0.1"
-
 # Port minions listen on
 KUBELET_PORT="--kubelet_port=10250"
 

contrib/init/systemd/environ/controller-manager

@@ -3,5 +3,8 @@
 
 # defaults from config and apiserver should be adequate
 
+# Comma seperated list of minions
+KUBELET_ADDRESSES="--machines=127.0.0.1"
+
 # Add you own!
 KUBE_CONTROLLER_MANAGER_ARGS=""

contrib/init/systemd/kube-apiserver.service

@@ -12,7 +12,6 @@ ExecStart=/usr/bin/kube-apiserver \
 	    ${KUBE_ETCD_SERVERS} \
 	    ${KUBE_API_ADDRESS} \
 	    ${KUBE_API_PORT} \
-	    ${KUBELET_ADDRESSES} \
 	    ${KUBELET_PORT} \
 	    ${KUBE_ALLOW_PRIV} \
 	    ${KUBE_SERVICE_ADDRESSES} \

contrib/init/systemd/kube-controller-manager.service

@@ -10,6 +10,7 @@ User=kube
 ExecStart=/usr/bin/kube-controller-manager \
 	    ${KUBE_LOGTOSTDERR} \
 	    ${KUBE_LOG_LEVEL} \
+	    ${KUBELET_ADDRESSES} \
 	    ${KUBE_MASTER} \
 	    ${KUBE_CONTROLLER_MANAGER_ARGS}
 Restart=on-failure