github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make kubemark scripts fail fast

Browse Source
This commit is contained in:
Shyam Jeedigunta
2017-05-29 20:43:53 +02:00
parent 9801a7da42
commit 02092312bb
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/kubemark/resources/start-kubemark-master.sh
View File

@@ -17,6 +17,10 @@
# Script that starts kubelet on kubemark-master as a supervisord process # Script that starts kubelet on kubemark-master as a supervisord process
# and then runs the master components as pods using kubelet. # and then runs the master components as pods using kubelet.
set -o errexit
set -o nounset
set -o pipefail
# Define key path variables. # Define key path variables.
KUBE_ROOT="/home/kubernetes" KUBE_ROOT="/home/kubernetes"
KUBE_BINDIR="${KUBE_ROOT}/kubernetes/server/bin" KUBE_BINDIR="${KUBE_ROOT}/kubernetes/server/bin"
@@ -93,7 +97,6 @@ function safe-format-and-mount() {
mkfs.ext4 -F "${device}" mkfs.ext4 -F "${device}"
fi fi
mkdir -p "${mountpoint}"
echo "Mounting '${device}' at '${mountpoint}'" echo "Mounting '${device}' at '${mountpoint}'"
mount -o discard,defaults "${device}" "${mountpoint}" mount -o discard,defaults "${device}" "${mountpoint}"
} }
@@ -493,9 +496,17 @@ start-kubemaster-component "kube-controller-manager"
start-kubemaster-component "kube-scheduler" start-kubemaster-component "kube-scheduler"
start-kubemaster-component "kube-addon-manager" start-kubemaster-component "kube-addon-manager"
# Wait till apiserver is working fine. # Wait till apiserver is working fine or timeout.
echo -n "Waiting for apiserver to be healthy"
start=$(date +%s)
until [ "$(curl 127.0.0.1:8080/healthz 2> /dev/null)" == "ok" ]; do until [ "$(curl 127.0.0.1:8080/healthz 2> /dev/null)" == "ok" ]; do
echo -n "."
sleep 1 sleep 1
now=$(date +%s)
if [ $((now - start)) -gt 300 ]; then
echo "Timeout!"
exit 1
fi
done done
echo "Done for the configuration for kubermark master" echo "Done for the configuration for kubermark master"

4
test/kubemark/start-kubemark.sh
View File

@@ -16,6 +16,10 @@
# Script that creates a Kubemark cluster for any given cloud provider. # Script that creates a Kubemark cluster for any given cloud provider.
set -o errexit
set -o nounset
set -o pipefail
TMP_ROOT="$(dirname "${BASH_SOURCE}")/../.." TMP_ROOT="$(dirname "${BASH_SOURCE}")/../.."
KUBE_ROOT=$(readlink -e ${TMP_ROOT} 2> /dev/null || perl -MCwd -e 'print Cwd::abs_path shift' ${TMP_ROOT}) KUBE_ROOT=$(readlink -e ${TMP_ROOT} 2> /dev/null || perl -MCwd -e 'print Cwd::abs_path shift' ${TMP_ROOT})