fix: simplify tailscale operator health gate

2026-04-30 19:34:33 +00:00
parent 5cf68771dd
commit 93a2a42917
2 changed files with 8 additions and 8 deletions
@@ -628,7 +628,14 @@ jobs:
          import_required_image ghcr.io/tailscale/k8s-operator:v1.96.5 "${PRIMARY_CP_IP}"
          import_required_image ghcr.io/tailscale/tailscale:v1.96.5 "${PRIMARY_CP_IP}"
          reconcile_flux_resource flux-system kustomization/addon-tailscale-operator 900
-          kubectl -n flux-system wait --for=condition=Ready kustomization/addon-tailscale-operator --timeout=600s
+          if ! kubectl -n flux-system wait --for=condition=Ready kustomization/addon-tailscale-operator --timeout=900s; then
+            kubectl -n flux-system describe kustomization/addon-tailscale-operator || true
+            kubectl -n flux-system describe helmrelease/tailscale-operator || true
+            kubectl -n tailscale-system get pods -o wide || true
+            kubectl -n tailscale-system describe deployment/operator || true
+            exit 1
+          fi
+          kubectl wait --for=condition=Established crd/proxyclasses.tailscale.com --timeout=600s
          kubectl -n tailscale-system rollout status deployment/operator --timeout=600s
          import_required_image registry.k8s.io/sig-storage/nfs-subdir-external-provisioner:v4.0.2 "${PRIMARY_CP_IP}"
          reconcile_flux_resource flux-system kustomization/addon-nfs-storage 600