recovery(ananke): fetch flux source before root thaw
This commit is contained in:
parent
83b56488b4
commit
6d3c59ad8d
@ -1166,6 +1166,10 @@ prepare_recovery_flux_root_apply_window() {
|
|||||||
patch_flux_suspend_all true
|
patch_flux_suspend_all true
|
||||||
patch_kustomization_suspend flux-system false
|
patch_kustomization_suspend flux-system false
|
||||||
|
|
||||||
|
if command -v flux >/dev/null 2>&1; then
|
||||||
|
run flux reconcile source git flux-system -n flux-system --timeout=3m || true
|
||||||
|
fi
|
||||||
|
|
||||||
if kubectl -n flux-system get deployment kustomize-controller >/dev/null 2>&1; then
|
if kubectl -n flux-system get deployment kustomize-controller >/dev/null 2>&1; then
|
||||||
run kubectl -n flux-system scale deployment kustomize-controller --replicas=1
|
run kubectl -n flux-system scale deployment kustomize-controller --replicas=1
|
||||||
kubectl -n flux-system rollout status deployment/kustomize-controller --timeout=2m || warn "kustomize-controller did not become Ready for Flux root apply."
|
kubectl -n flux-system rollout status deployment/kustomize-controller --timeout=2m || warn "kustomize-controller did not become Ready for Flux root apply."
|
||||||
@ -1583,7 +1587,6 @@ resume_deadlock_automation_after_core_recovery() {
|
|||||||
run kubectl -n flux-system scale deployment helm-controller --replicas=1
|
run kubectl -n flux-system scale deployment helm-controller --replicas=1
|
||||||
fi
|
fi
|
||||||
if command -v flux >/dev/null 2>&1; then
|
if command -v flux >/dev/null 2>&1; then
|
||||||
run flux reconcile source git flux-system -n flux-system --timeout=3m || true
|
|
||||||
if [[ "${RECOVERY_FLUX_APPLY_BOOTSTRAP_KUSTOMIZATION}" == "1" || "${RECOVERY_FLUX_APPLY_BOOTSTRAP_KUSTOMIZATION}" == "true" ]]; then
|
if [[ "${RECOVERY_FLUX_APPLY_BOOTSTRAP_KUSTOMIZATION}" == "1" || "${RECOVERY_FLUX_APPLY_BOOTSTRAP_KUSTOMIZATION}" == "true" ]]; then
|
||||||
run flux reconcile kustomization flux-system -n flux-system --timeout="${RECOVERY_FLUX_ROOT_APPLY_TIMEOUT}" || warn "flux-system Kustomization did not apply the recovery source revision before final suspension."
|
run flux reconcile kustomization flux-system -n flux-system --timeout="${RECOVERY_FLUX_ROOT_APPLY_TIMEOUT}" || warn "flux-system Kustomization did not apply the recovery source revision before final suspension."
|
||||||
fi
|
fi
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user