Merge pull request #8785 from aveshagarwal/kubernetes-fixes

contrib/init/systemd/environ/controller-manager

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

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

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

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

@@ -77,15 +77,6 @@ KUBE_SERVICE_ADDRESSES="--portal_net=10.254.0.0/16"
 KUBE_API_ARGS=""
 ```
 
-* *Optional* Edit /etc/kubernetes/controller-manager and remove --machines=127.0.0.1 from the KUBELET_ADDRESSES. Leaving this in won't hurt anything but it will cause the output to note that the 127.0.0.1 node is NotReady because we will not be configuring one in this guide.
-
-```
-KUBELET_ADDRESSES=""
-
-KUBE_CONTROLLER_MANAGER_ARGS=""
-```
-
-
 * Edit /etc/etcd/etcd.conf,let the etcd to listen all the ip instead of 127.0.0.1, if not, you will get the error like "connection refused"
 ```
 ETCD_LISTEN_CLIENT_URLS="http://0.0.0.0:4001"