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

@@ -143,7 +143,6 @@ kube::util::wait_for_url "http://127.0.0.1:${API_PORT}/healthz" "apiserver"
# Start controller manager
kube::log::status "Starting controller-manager"
"${KUBE_OUTPUT_HOSTBIN}/kube-controller-manager" \
--machines="127.0.0.1" \
--port="${CTLRMGR_PORT}" \
--master="127.0.0.1:${API_PORT}" 1>&2 &
CTLRMGR_PID=$!