github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-11 06:02:18 +00:00
Code Issues Projects Releases Wiki Activity

Do not override environment variable in ubuntu defaults and ubuntu/build.sh

Browse Source
This commit is contained in:
Arsen Mamikonyan
2015-06-17 07:35:54 -07:00
parent 3094c1624b
commit 38c3bdfa45
5 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cluster/ubuntu/util.sh
View File

@@ -146,39 +146,41 @@ function verify-cluster {
function verify-master(){
# verify master has all required daemons
echo "Validating master"
printf "Validating master"
local -a required_daemon=("kube-apiserver" "kube-controller-manager" "kube-scheduler")
local validated="1"
until [[ "$validated" == "0" ]]; do
validated="0"
local daemon
for daemon in "${required_daemon[@]}"; do
ssh "$MASTER" "pgrep -f ${daemon}" >/dev/null 2>&1 || {
ssh $SSH_OPTS "$MASTER" "pgrep -f ${daemon}" >/dev/null 2>&1 || {
printf "."
validated="1"
sleep 2
}
done
done
printf "\n"
}
function verify-minion(){
# verify minion has all required daemons
echo "Validating ${1}"
printf "Validating ${1}"
local -a required_daemon=("kube-proxy" "kubelet" "docker")
local validated="1"
until [[ "$validated" == "0" ]]; do
validated="0"
local daemon
for daemon in "${required_daemon[@]}"; do
ssh "$1" "pgrep -f $daemon" >/dev/null 2>&1 || {
ssh $SSH_OPTS "$1" "pgrep -f $daemon" >/dev/null 2>&1 || {
printf "."
validated="1"
sleep 2
}
done
done
printf "\n"
}
function create-etcd-opts(){