diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index d183ece..b865a6a 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -255,7 +255,11 @@ jobs: wait_for_resource flux-system "ocirepository.source.toolkit.fluxcd.io/${oci_name}" 600 reconcile_at="$(date +%s)" kubectl -n flux-system annotate "ocirepository/${oci_name}" reconcile.fluxcd.io/requestedAt="${reconcile_at}" --overwrite - kubectl -n flux-system annotate "helmrelease/${release_name}" reconcile.fluxcd.io/requestedAt="${reconcile_at}" --overwrite + 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 if ! kubectl -n flux-system wait --for=condition=Ready "ocirepository/${oci_name}" --timeout="${oci_timeout}"; then eso_diagnostics @@ -300,7 +304,11 @@ jobs: wait_for_resource flux-system "helmchart.source.toolkit.fluxcd.io/${chart_name}" 600 reconcile_at="$(date +%s)" kubectl -n flux-system annotate "helmchart.source.toolkit.fluxcd.io/${chart_name}" reconcile.fluxcd.io/requestedAt="${reconcile_at}" --overwrite - kubectl -n flux-system annotate "helmrelease/${release_name}" reconcile.fluxcd.io/requestedAt="${reconcile_at}" --overwrite + 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 if ! kubectl -n flux-system wait --for=condition=Ready "helmchart.source.toolkit.fluxcd.io/${chart_name}" --timeout="${chart_timeout}"; then flux_helm_diagnostics "${repo_name}" "${chart_name}" "${release_name}" "${target_namespace}"