Merge pull request #6916 from ArtfulCoder/controller-in-a-pod

kube-controller-manager in a pod.
This commit is contained in:
Eric Tune
2015-04-21 09:58:29 -07:00
6 changed files with 149 additions and 243 deletions

View File

@@ -179,7 +179,7 @@ function verify-cluster {
# verify master has all required daemons
echo "Validating master"
local machine="master"
local -a required_daemon=("salt-master" "salt-minion" "nginx" "kube-controller-manager" "kubelet")
local -a required_daemon=("salt-master" "salt-minion" "nginx" "kubelet")
local validated="1"
until [[ "$validated" == "0" ]]; do
validated="0"