diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 60a99b3..52a4960 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -602,6 +602,17 @@ 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 @@ -612,9 +623,9 @@ jobs: 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/addon-observability --timeout=60s - kubectl -n flux-system wait --for=condition=Ready kustomization/addon-observability-content --timeout=60s - kubectl -n flux-system wait --for=condition=Ready helmrelease --all --timeout=60s + 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 get storageclass | grep -E "^flash-nfs.*\\(default\\)" kubectl get pods -A --no-headers \ | grep -Ev "[[:space:]](Running|Completed)[[:space:]]" \ diff --git a/infrastructure/addons/observability/helmrelease-promtail.yaml b/infrastructure/addons/observability/helmrelease-promtail.yaml index 39dd469..f98861a 100644 --- a/infrastructure/addons/observability/helmrelease-promtail.yaml +++ b/infrastructure/addons/observability/helmrelease-promtail.yaml @@ -5,6 +5,7 @@ metadata: namespace: flux-system spec: interval: 10m + timeout: 20m targetNamespace: observability chartRef: kind: OCIRepository