Update master_node_install.sh

This commit is contained in:
RomanNum3ral 2026-03-27 22:47:07 +00:00
parent c82ae6c8fd
commit d1fd238610
1 changed files with 17 additions and 14 deletions

View File

@ -63,6 +63,7 @@ on_error() {
echo " sudo journalctl -u rke2-server -n 200 --no-pager" echo " sudo journalctl -u rke2-server -n 200 --no-pager"
echo " sudo /var/lib/rancher/rke2/bin/kubectl --kubeconfig ${KUBECONFIG_FILE} get nodes -o wide" echo " sudo /var/lib/rancher/rke2/bin/kubectl --kubeconfig ${KUBECONFIG_FILE} get nodes -o wide"
echo " sudo /var/lib/rancher/rke2/bin/kubectl --kubeconfig ${KUBECONFIG_FILE} get pods -A" echo " sudo /var/lib/rancher/rke2/bin/kubectl --kubeconfig ${KUBECONFIG_FILE} get pods -A"
echo " sudo /var/lib/rancher/rke2/bin/kubectl --kubeconfig ${KUBECONFIG_FILE} -n kube-system get deploy,ds"
exit "${exit_code}" exit "${exit_code}"
} }
trap 'on_error $LINENO' ERR trap 'on_error $LINENO' ERR
@ -309,34 +310,36 @@ wait_for_system_pods() {
log "Waiting for Canal (CNI) to be fully rolled out" log "Waiting for Canal (CNI) to be fully rolled out"
kubectl_rke2 -n kube-system rollout status daemonset/rke2-canal --timeout=20m kubectl_rke2 -n kube-system rollout status daemonset/rke2-canal --timeout=20m
# Give kube-proxy and service routing a moment to settle.
sleep 20 sleep 20
log "Waiting for bundled RKE2 addon deployments" log "Waiting for bundled RKE2 addon objects to exist"
waited=0 waited=0
until kubectl_rke2 -n kube-system get deploy \ until kubectl_rke2 -n kube-system get deployment rke2-coredns-rke2-coredns >/dev/null 2>&1 \
rke2-ingress-nginx-controller \ && kubectl_rke2 -n kube-system get deployment rke2-coredns-rke2-coredns-autoscaler >/dev/null 2>&1 \
rke2-metrics-server \ && kubectl_rke2 -n kube-system get deployment rke2-metrics-server >/dev/null 2>&1 \
rke2-snapshot-controller \ && kubectl_rke2 -n kube-system get deployment rke2-snapshot-controller >/dev/null 2>&1 \
rke2-coredns-rke2-coredns >/dev/null 2>&1; do && kubectl_rke2 -n kube-system get daemonset rke2-ingress-nginx-controller >/dev/null 2>&1; do
sleep 5 sleep 5
waited=$((waited + 5)) waited=$((waited + 5))
if (( waited % 30 == 0 )); then if (( waited % 30 == 0 )); then
warn "Bundled addon deployments are not all present yet" warn "Bundled addon objects are not all present yet"
kubectl_rke2 -n kube-system get deploy || true kubectl_rke2 -n kube-system get deploy,ds || true
kubectl_rke2 -n kube-system get pods -o wide || true kubectl_rke2 -n kube-system get pods -o wide || true
fi fi
if (( waited >= 900 )); then if (( waited >= 900 )); then
kubectl_rke2 -n kube-system get deploy,ds || true
kubectl_rke2 -n kube-system get pods -o wide || true kubectl_rke2 -n kube-system get pods -o wide || true
die "Timed out waiting for bundled RKE2 addon deployments" die "Timed out waiting for bundled RKE2 addon objects"
fi fi
done done
kubectl_rke2 -n kube-system rollout status deploy/rke2-ingress-nginx-controller --timeout=20m log "Waiting for bundled RKE2 addons to roll out"
kubectl_rke2 -n kube-system rollout status deploy/rke2-metrics-server --timeout=20m kubectl_rke2 -n kube-system rollout status deployment/rke2-coredns-rke2-coredns --timeout=20m
kubectl_rke2 -n kube-system rollout status deploy/rke2-snapshot-controller --timeout=20m kubectl_rke2 -n kube-system rollout status deployment/rke2-coredns-rke2-coredns-autoscaler --timeout=20m
kubectl_rke2 -n kube-system rollout status deploy/rke2-coredns-rke2-coredns --timeout=20m kubectl_rke2 -n kube-system rollout status deployment/rke2-metrics-server --timeout=20m
kubectl_rke2 -n kube-system rollout status deployment/rke2-snapshot-controller --timeout=20m
kubectl_rke2 -n kube-system rollout status daemonset/rke2-ingress-nginx-controller --timeout=20m
log "System pods are settled" log "System pods are settled"
kubectl_rke2 get pods -A || true kubectl_rke2 get pods -A || true