mirror of
https://codeberg.org/27/inception-of-things.git
synced 2025-12-31 21:56:41 +01:00
「🔨」 fix(scripts): removed useless sleep and replace them with wait
This commit is contained in:
@ -6,8 +6,18 @@ echo "Launching k3s install"
|
|||||||
curl -sfL https://get.k3s.io | INSTALL_K3S_EXEC="--write-kubeconfig-mode 644" sh -s - server --cluster-init --node-ip=$S_ADDR --bind-address=$S_ADDR --advertise-address=$S_ADDR
|
curl -sfL https://get.k3s.io | INSTALL_K3S_EXEC="--write-kubeconfig-mode 644" sh -s - server --cluster-init --node-ip=$S_ADDR --bind-address=$S_ADDR --advertise-address=$S_ADDR
|
||||||
|
|
||||||
# Additional wait to ensure API is responsive (optional but helpful)
|
# Additional wait to ensure API is responsive (optional but helpful)
|
||||||
echo Waiting
|
I=0
|
||||||
sleep 15
|
until k3s kubectl get --raw='/readyz' > /dev/null 2>&1; do
|
||||||
|
echo "Waiting for K3s to be ready..."
|
||||||
|
sleep 5
|
||||||
|
I=$((I+1))
|
||||||
|
if [ $I -eq 5 ]; then
|
||||||
|
echo "threshold gone, ffs"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
echo "K3s is ready!"
|
||||||
|
|
||||||
echo "Copying token"
|
echo "Copying token"
|
||||||
cat /var/lib/rancher/k3s/server/node-token > /vagrant/node-token
|
cat /var/lib/rancher/k3s/server/node-token > /vagrant/node-token
|
||||||
|
|||||||
@ -4,16 +4,16 @@ S_ADDR="192.168.56.110"
|
|||||||
SW_ADDR="192.168.56.111"
|
SW_ADDR="192.168.56.111"
|
||||||
|
|
||||||
# In setup-SW.sh, before the k3s install command
|
# In setup-SW.sh, before the k3s install command
|
||||||
# echo "Checking connectivity to server"
|
echo "Checking connectivity to server"
|
||||||
# I=0
|
I=0
|
||||||
# while ! curl -k https://$S_ADDR:6443/healthz > /dev/null 2>&1; do
|
while ! curl -k https://$S_ADDR:6443/readyz > /dev/null 2>&1; do
|
||||||
# echo "Server API not reachable yet, waiting..."
|
echo "Server API not reachable yet, waiting..."
|
||||||
# sleep 5
|
sleep 5
|
||||||
# I=$((I+1))
|
I=$((I+1))
|
||||||
# if [ $I -eq 5 ]; then
|
if [ $I -eq 5 ]; then
|
||||||
# exit 1
|
exit 1
|
||||||
# fi
|
fi
|
||||||
# done
|
done
|
||||||
echo "Server is reachable, proceeding with k3s agent install"
|
echo "Server is reachable, proceeding with k3s agent install"
|
||||||
|
|
||||||
echo "Waiting for token"
|
echo "Waiting for token"
|
||||||
|
|||||||
@ -1,7 +1,20 @@
|
|||||||
#!/usr/bin/env sh
|
#!/usr/bin/env sh
|
||||||
|
|
||||||
echo "Launching k3s install"
|
S_ADDR="192.168.56.110"
|
||||||
curl -sfL https://get.k3s.io | sh -s - server --cluster-init --node-ip=192.168.56.110
|
|
||||||
|
|
||||||
echo Waiting
|
echo "Launching k3s install"
|
||||||
sleep 15
|
curl -sfL https://get.k3s.io | INSTALL_K3S_EXEC="--write-kubeconfig-mode 644" sh -s - server --cluster-init --node-ip=$S_ADDR --bind-address=$S_ADDR --advertise-address=$S_ADDR
|
||||||
|
|
||||||
|
# Wait for K3s to be ready
|
||||||
|
I=0
|
||||||
|
until k3s kubectl get --raw='/healthz' > /dev/null 2>&1; do
|
||||||
|
echo "Waiting for K3s to be ready..."
|
||||||
|
sleep 5
|
||||||
|
I=$((I+1))
|
||||||
|
if [ $I -eq 5 ]; then
|
||||||
|
echo "threshold gone, ffs"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
echo "K3s is ready!"
|
||||||
|
|||||||
Reference in New Issue
Block a user