From bd6f13bc9202b10ae34edddbc278aa86b4ba7681 Mon Sep 17 00:00:00 2001 From: "juvenal.diaz" Date: Sat, 26 Sep 2026 10:58:29 -0600 Subject: [PATCH] Fail Calico readiness checks faster --- bootstrap/platform/main.tf | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bootstrap/platform/main.tf b/bootstrap/platform/main.tf index 16694e8..9db1fae 100644 --- a/bootstrap/platform/main.tf +++ b/bootstrap/platform/main.tf @@ -449,7 +449,7 @@ resource "null_resource" "calico_ready" { triggers = { kubeconfig_path = var.kubeconfig_path calico_version = var.calico.version - calico_ready_version = "3" + calico_ready_version = "4" pod_network_cidr = var.pod_network_cidr calico_node_address_autodetection_cidrs = join(",", var.calico_node_address_autodetection_cidrs) calico_operator_node_name = var.calico_operator_node_name @@ -507,15 +507,15 @@ if kubectl --kubeconfig "${self.triggers.kubeconfig_path}" get node "${self.trig exit 1 fi -wait_for_resource deployment tigera-operator tigera-operator 300 +wait_for_resource deployment tigera-operator tigera-operator 180 kubectl --kubeconfig "${self.triggers.kubeconfig_path}" -n tigera-operator patch deployment tigera-operator --type merge -p '{"spec":{"template":{"spec":{"tolerations":[{"operator":"Exists","effect":"NoSchedule"},{"operator":"Exists","effect":"NoExecute"}]}}}}' -kubectl --kubeconfig "${self.triggers.kubeconfig_path}" -n tigera-operator rollout status deployment/tigera-operator --timeout=300s +kubectl --kubeconfig "${self.triggers.kubeconfig_path}" -n tigera-operator rollout status deployment/tigera-operator --timeout=180s -wait_for_resource daemonset calico-system calico-node 600 -wait_for_resource deployment calico-system calico-kube-controllers 600 -kubectl --kubeconfig "${self.triggers.kubeconfig_path}" -n calico-system rollout status daemonset/calico-node --timeout=600s -kubectl --kubeconfig "${self.triggers.kubeconfig_path}" -n calico-system rollout status deployment/calico-kube-controllers --timeout=600s -kubectl --kubeconfig "${self.triggers.kubeconfig_path}" wait --for=condition=Ready nodes --all --timeout=600s +wait_for_resource daemonset calico-system calico-node 300 +wait_for_resource deployment calico-system calico-kube-controllers 300 +kubectl --kubeconfig "${self.triggers.kubeconfig_path}" -n calico-system rollout status daemonset/calico-node --timeout=300s +kubectl --kubeconfig "${self.triggers.kubeconfig_path}" -n calico-system rollout status deployment/calico-kube-controllers --timeout=300s +kubectl --kubeconfig "${self.triggers.kubeconfig_path}" wait --for=condition=Ready nodes --all --timeout=300s EOT } }