mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
Merge pull request #46605 from shyamjvs/fix-perfdata-subresource
Automatic merge from submit-queue (batch tested with PRs 46552, 46608, 46390, 46605, 46459) Make kubemark scripts fail fast Fixes https://github.com/kubernetes/kubernetes/issues/46601 /cc @wojtek-t @gmarek
This commit is contained in:
commit
36548b07cd
@ -17,6 +17,10 @@
|
||||
# Script that starts kubelet on kubemark-master as a supervisord process
|
||||
# and then runs the master components as pods using kubelet.
|
||||
|
||||
set -o errexit
|
||||
set -o nounset
|
||||
set -o pipefail
|
||||
|
||||
# Define key path variables.
|
||||
KUBE_ROOT="/home/kubernetes"
|
||||
KUBE_BINDIR="${KUBE_ROOT}/kubernetes/server/bin"
|
||||
@ -93,7 +97,6 @@ function safe-format-and-mount() {
|
||||
mkfs.ext4 -F "${device}"
|
||||
fi
|
||||
|
||||
mkdir -p "${mountpoint}"
|
||||
echo "Mounting '${device}' at '${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-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
|
||||
echo -n "."
|
||||
sleep 1
|
||||
now=$(date +%s)
|
||||
if [ $((now - start)) -gt 300 ]; then
|
||||
echo "Timeout!"
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
|
||||
echo "Done for the configuration for kubermark master"
|
||||
|
@ -16,6 +16,10 @@
|
||||
|
||||
# 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}")/../.."
|
||||
KUBE_ROOT=$(readlink -e ${TMP_ROOT} 2> /dev/null || perl -MCwd -e 'print Cwd::abs_path shift' ${TMP_ROOT})
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user