From ef2b986b2f96d05b2e9f8a5681f44ebac37a1b29 Mon Sep 17 00:00:00 2001 From: Brennan Kinney <5098581+polarathene@users.noreply.github.com> Date: Sat, 8 Nov 2025 17:28:32 +1300 Subject: [PATCH] chore: `k8s_setup.sh` should use `kubectl wait` It's been over 5 years since the current logic to wait on clusters was contributed. Better to use `kubectl wait` now. This will also better convey failure when `kubectl` is not a valid binary. Signed-off-by: Brennan Kinney <5098581+polarathene@users.noreply.github.com> --- build/kubernetes/k8s_setup.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/build/kubernetes/k8s_setup.sh b/build/kubernetes/k8s_setup.sh index 3f1da356..7707d131 100755 --- a/build/kubernetes/k8s_setup.sh +++ b/build/kubernetes/k8s_setup.sh @@ -11,10 +11,7 @@ curl -Lo ./kind https://github.com/kubernetes-sigs/kind/releases/download/${KIND kind create cluster --image kindest/node:${K8S_VERSION} # Wait for cluster to be ready -JSONPATH='{range .items[*]}{@.metadata.name}:{range @.status.conditions[*]}{@.type}={@.status};{end}{end}'; -until kubectl get nodes -o jsonpath="$JSONPATH" 2>&1 | grep -q "Ready=True"; do - sleep 1; -done +kubectl wait --for=condition=Ready nodes --all --timeout=60s >/dev/null 2>&1 # Scale the CoreDNS replicas to simplify testing kubectl scale -n kube-system deployment/coredns --replicas=1