Merge pull request #10370 from mikedanese/no-more-machines

remove --machines and related deprecated flags from code and docs

docs/getting-started-guides/centos/centos_manual_config.md

@@ -111,12 +111,6 @@ KUBE_SERVICE_ADDRESSES="--service-cluster-ip-range=10.254.0.0/16"
 KUBE_API_ARGS=""
 ```
 
-* Edit /etc/kubernetes/controller-manager to appear as such:
-```
-# Comma separated list of minions
-KUBELET_ADDRESSES="--machines=centos-minion"
-```
-
 * Start the appropriate services on master:
 
 ```

docs/getting-started-guides/coreos/cloud-configs/standalone.yaml

@@ -90,7 +90,7 @@ coreos:
         --logtostderr=true
         Restart=always
         RestartSec=10
-    - name: kube-controller-manager.service 
+    - name: kube-controller-manager.service
       command: start
       content: |
         [Unit]
@@ -103,7 +103,6 @@ coreos:
         ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes-release/release/v0.18.2/bin/linux/amd64/kube-controller-manager
         ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-controller-manager
         ExecStart=/opt/bin/kube-controller-manager \
-        --machines=127.0.0.1 \
         --master=127.0.0.1:8080 \
         --logtostderr=true
         Restart=always

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

@@ -59,24 +59,12 @@ The kube-controller-manager has several options.
 **--logtostderr**=true
 	log to standard error instead of files
 
-**--machines**=[]
-	List of machines to schedule onto, comma separated.
-
 **--master**=""
 	The address of the Kubernetes API server (overrides any value in kubeconfig)
 
-**--minion-regexp**=""
-	If non empty, and --cloud-provider is specified, a regular expression for matching minion VMs.
-
 **--namespace-sync-period**=5m0s
 	The period for syncing namespace life-cycle updates
 
-**--node-memory**=3Gi
-	The amount of memory (in bytes) provisioned on each node
-
-**--node-milli-cpu**=1000
-	The amount of MilliCPU provisioned on each node
-
 **--node-monitor-grace-period**=40s
 	Amount of time which we allow running Node to be unresponsive before marking it unhealty. Must be N times more than kubelet's nodeStatusUpdateFrequency, where N means number of retries allowed for kubelet to post node status.
 
@@ -113,9 +101,6 @@ The kube-controller-manager has several options.
 **--stderrthreshold**=2
 	logs at or above this threshold go to stderr
 
-**--sync-nodes**=true
-	If true, and --cloud-provider is specified, sync nodes from the cloud provider. Default true.
-
 **--v**=0
 	log level for V logs
 
@@ -127,7 +112,7 @@ The kube-controller-manager has several options.
 
 # EXAMPLES
 ```
-/usr/bin/kube-controller-manager --logtostderr=true --v=0 --master=127.0.0.1:8080 --machines=127.0.0.1 
+/usr/bin/kube-controller-manager --logtostderr=true --v=0 --master=127.0.0.1:8080
 ```
 
 # HISTORY