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

remove --machines and related deprecated flags from code and docs
This commit is contained in:
Robert Bailey
2015-06-26 10:54:01 -07:00
9 changed files with 3 additions and 56 deletions

View File

@@ -12,7 +12,6 @@
"/hyperkube",
"controller-manager",
"--master=127.0.0.1:8080",
"--machines=127.0.0.1",
"--sync_nodes=true",
"--v=2"
]

View File

@@ -12,7 +12,6 @@
"/hyperkube",
"controller-manager",
"--master=127.0.0.1:8080",
"--machines=127.0.0.1",
"--sync_nodes=true",
"--v=2"
]

View File

@@ -36,8 +36,7 @@ coreos:
[Service]
ExecStart=/opt/kubernetes/bin/kube-controller-manager \
--master=127.0.0.1:8080 \
--machines=${machines}
--master=127.0.0.1:8080
Restart=always
RestartSec=2