fix: reset tailscale helm release directly

2026-04-30 20:25:48 +00:00
parent 93a2a42917
commit d57e8c8fe8
2 changed files with 4 additions and 9 deletions
@@ -628,13 +628,13 @@ 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
-          if ! kubectl -n flux-system wait --for=condition=Ready kustomization/addon-tailscale-operator --timeout=900s; then
+          if ! kubectl -n flux-system wait --for=condition=Ready kustomization/addon-tailscale-operator --timeout=300s; 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
+          wait_for_resource flux-system helmrelease.helm.toolkit.fluxcd.io/tailscale-operator 600
+          reconcile_helmrelease tailscale-operator 900
+          wait_for_helmrelease_ready tailscale-operator tailscale-system 900
          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}"
@@ -11,10 +11,5 @@ spec:
    name: platform
  path: ./infrastructure/addons/tailscale-operator
  wait: false
-  healthChecks:
-    - apiVersion: helm.toolkit.fluxcd.io/v2
-      kind: HelmRelease
-      name: tailscale-operator
-      namespace: flux-system
  timeout: 10m
  suspend: false