From 003333a061365ff1c3288b2c026a362d2baaac4c Mon Sep 17 00:00:00 2001
From: MichaelFisher1997 <contact@michaelfisher.tech>
Date: Sat, 25 Apr 2026 03:52:43 +0000
Subject: [PATCH] fix: make health checks observe Flux readiness

---
 .gitea/workflows/deploy.yml | 35 ++++++++++++-----------------------
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 0a2bbfe..e03b8ae 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -602,30 +602,19 @@ jobs:
             set -euo pipefail
             kubectl get nodes -o wide
             kubectl -n flux-system get gitrepositories,kustomizations,helmreleases,ocirepositories
-            reconcile_at=$(date +%s)
-            for release_name in kube-prometheus-stack loki promtail; do
-              kubectl -n flux-system annotate "helmrelease/${release_name}" \
-                reconcile.fluxcd.io/requestedAt="${reconcile_at}" \
-                reconcile.fluxcd.io/resetAt="${reconcile_at}" \
-                reconcile.fluxcd.io/forceAt="${reconcile_at}" \
-                --overwrite
-            done
-            kubectl -n flux-system annotate kustomization/addon-observability \
-              reconcile.fluxcd.io/requestedAt="${reconcile_at}" \
-              --overwrite
-            kubectl -n flux-system wait --for=condition=Ready kustomization/infrastructure --timeout=60s
-            kubectl -n flux-system wait --for=condition=Ready kustomization/addon-cert-manager --timeout=60s
-            kubectl -n flux-system wait --for=condition=Ready kustomization/addon-external-secrets --timeout=60s
-            kubectl -n flux-system wait --for=condition=Ready kustomization/addon-nfs-storage --timeout=60s
-            kubectl -n flux-system wait --for=condition=Ready kustomization/addon-tailscale-operator --timeout=60s
-            kubectl -n flux-system wait --for=condition=Ready kustomization/addon-tailscale-proxyclass --timeout=60s
-            kubectl -n flux-system wait --for=condition=Ready kustomization/addon-rancher --timeout=60s
-            kubectl -n flux-system wait --for=condition=Ready kustomization/addon-rancher-config --timeout=60s
-            kubectl -n flux-system wait --for=condition=Ready kustomization/addon-rancher-backup --timeout=60s
-            kubectl -n flux-system wait --for=condition=Ready kustomization/addon-rancher-backup-config --timeout=60s
+            kubectl -n flux-system wait --for=condition=Ready kustomization/infrastructure --timeout=300s
+            kubectl -n flux-system wait --for=condition=Ready kustomization/addon-cert-manager --timeout=300s
+            kubectl -n flux-system wait --for=condition=Ready kustomization/addon-external-secrets --timeout=300s
+            kubectl -n flux-system wait --for=condition=Ready kustomization/addon-nfs-storage --timeout=300s
+            kubectl -n flux-system wait --for=condition=Ready kustomization/addon-tailscale-operator --timeout=300s
+            kubectl -n flux-system wait --for=condition=Ready kustomization/addon-tailscale-proxyclass --timeout=300s
+            kubectl -n flux-system wait --for=condition=Ready kustomization/addon-rancher --timeout=900s
+            kubectl -n flux-system wait --for=condition=Ready kustomization/addon-rancher-config --timeout=300s
+            kubectl -n flux-system wait --for=condition=Ready kustomization/addon-rancher-backup --timeout=300s
+            kubectl -n flux-system wait --for=condition=Ready kustomization/addon-rancher-backup-config --timeout=300s
             kubectl -n flux-system wait --for=condition=Ready kustomization/addon-observability --timeout=1200s
-            kubectl -n flux-system wait --for=condition=Ready kustomization/addon-observability-content --timeout=120s
-            kubectl -n flux-system wait --for=condition=Ready helmrelease --all --timeout=120s
+            kubectl -n flux-system wait --for=condition=Ready kustomization/addon-observability-content --timeout=300s
+            kubectl -n flux-system wait --for=condition=Ready helmrelease --all --timeout=1200s
             kubectl annotate storageclass local-path storageclass.kubernetes.io/is-default-class=false --overwrite
             kubectl annotate storageclass flash-nfs storageclass.kubernetes.io/is-default-class=true --overwrite
             kubectl get storageclass | grep -E "^flash-nfs.*\\(default\\)"