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

docs/getting-started-guides/coreos/configs/master.yml

@@ -119,7 +119,6 @@ coreos:
         --address=127.0.0.1 \
         --port=8080 \
         --etcd_servers=http://127.0.0.1:4001 \
-        --machines=192.168.12.10,192.168.12.11,192.168.12.12 \
         --logtostderr=true
         Restart=always
         RestartSec=10
@@ -161,6 +160,7 @@ coreos:
         [Service]
         ExecStart=/opt/bin/controller-manager \
         --master=127.0.0.1:8080 \
+        --machines=192.168.12.10,192.168.12.11,192.168.12.12 \
         --logtostderr=true
         Restart=always
         RestartSec=10

docs/getting-started-guides/coreos/configs/standalone.yml

@@ -48,7 +48,6 @@ coreos:
         --address=127.0.0.1 \
         --port=8080 \
         --etcd_servers=http://127.0.0.1:4001 \
-        --machines=127.0.0.1 \
         --logtostderr=true
         Restart=on-failure
         RestartSec=1
@@ -86,6 +85,7 @@ coreos:
         [Service]
         ExecStart=/opt/bin/controller-manager \
         --master=127.0.0.1:8080 \
+        --machines=127.0.0.1 \
         --logtostderr=true
         Restart=on-failure
         RestartSec=1

docs/getting-started-guides/coreos/units/apiserver.service

@@ -8,7 +8,6 @@ ExecStart=/opt/bin/apiserver \
 --address=127.0.0.1 \
 --port=8080 \
 --etcd_servers=http://127.0.0.1:4001 \
---machines=127.0.0.1 \
 --portal_net=10.0.0.0/24 \
 --logtostderr=true
 Restart=on-failure

docs/getting-started-guides/coreos/units/controller-manager.service

@@ -6,6 +6,7 @@ Documentation=https://github.com/GoogleCloudPlatform/kubernetes
 [Service]
 ExecStart=/opt/bin/controller-manager \
 --master=127.0.0.1:8080 \
+--machines=127.0.0.1 \
 --etcd_servers=http://127.0.0.1:4001 \
 --logtostderr=true
 Restart=on-failure

docs/getting-started-guides/fedora/fedora_manual_config.md

@@ -102,9 +102,6 @@ KUBE_API_PORT="--port=8080"
 # How the replication controller and scheduler find the apiserver
 KUBE_MASTER="--master=fed-master:8080"
 
-# Comma seperated list of minions
-KUBELET_ADDRESSES="--machines=fed-minion"
-
 # Port minions listen on
 KUBELET_PORT="--kubelet_port=10250"
 
@@ -115,6 +112,18 @@ KUBE_SERVICE_ADDRESSES="--portal_net=10.254.0.0/16"
 KUBE_API_ARGS=""
 ```
 
+* Edit /etc/kubernetes/controller-manager to appear as such:
+```
+###
+# kubernetes system config
+#
+# The following values are used to configure the kubernetes-controller-manager
+#
+
+# Comma seperated list of minions
+KUBELET_ADDRESSES="--machines=fed-minion"
+```
+
 * Start the appropriate services on master:
 
 ```

docs/man/kube-apiserver.1.md

@@ -53,9 +53,6 @@ The the kube-apiserver several options.
 **-logtostderr**=
 	log to standard error instead of files. Default is false.
 
-**-machines**=[]
-	List of machines to schedule onto, comma separated.
-
 **-minion_cache_ttl**=30s
 	Duration of time to cache minion information. Default 30 seconds.
 

docs/man/kube-controller-manager.1.md

@@ -44,6 +44,9 @@ The kube-controller-manager has several options.
 **-logtostderr**=false
 	log to standard error instead of files.
 
+**-machines**=[]
+        List of machines to schedule onto, comma separated.
+
 **-master**=""
 	The address of the Kubernetes API server.
 

docs/man/man1/kube-apiserver.1

@@ -69,10 +69,6 @@ The the kube\-apiserver several options.
 \fB\-logtostderr\fP=
     log to standard error instead of files. Default is false.
 
-.PP
-\fB\-machines\fP=[]
-    List of machines to schedule onto, comma separated.
-
 .PP
 \fB\-minion\_cache\_ttl\fP=30s
     Duration of time to cache minion information. Default 30 seconds.

docs/man/man1/kube-controller-manager.1

@@ -56,6 +56,10 @@ The kube\-controller\-manager has several options.
 \fB\-logtostderr\fP=false
     log to standard error instead of files.
 
+.PP
+\fB\-machines\fP=[]
+    List of machines to schedule onto, comma separated.
+
 .PP
 \fB\-master\fP=""
     The address of the Kubernetes API server.