From 93a2a4291751faa8b239b150c5f435b8b458afe3 Mon Sep 17 00:00:00 2001 From: MichaelFisher1997 Date: Thu, 30 Apr 2026 19:34:33 +0000 Subject: [PATCH] fix: simplify tailscale operator health gate --- .gitea/workflows/deploy.yml | 9 ++++++++- .../addons/kustomization-tailscale-operator.yaml | 7 ------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index f4038db..a3617cc 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -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 diff --git a/infrastructure/addons/kustomization-tailscale-operator.yaml b/infrastructure/addons/kustomization-tailscale-operator.yaml index 2e52943..3b02935 100644 --- a/infrastructure/addons/kustomization-tailscale-operator.yaml +++ b/infrastructure/addons/kustomization-tailscale-operator.yaml @@ -16,12 +16,5 @@ spec: kind: HelmRelease name: tailscale-operator namespace: flux-system - - apiVersion: apps/v1 - kind: Deployment - name: operator - namespace: tailscale-system - - apiVersion: apiextensions.k8s.io/v1 - kind: CustomResourceDefinition - name: proxyclasses.tailscale.com timeout: 10m suspend: false