github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-07 04:03:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'rename-to-kube' of https://github.com/eparis/kubernetes into eparis-rename-to-kube

Browse Source 
* 'rename-to-kube' of https://github.com/eparis/kubernetes:
  rename kube server binaries to kube-

Conflicts:
	docs/salt.md
This commit is contained in:
Joe Beda
2014-11-17 09:52:10 -08:00
parent 5fc485f0bc a99c3c7963
commit 66d287f7e4
53 changed files with 235 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/vagrant/util.sh
View File

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