Skip to content

Commit

Permalink
clear app status op state
Browse files Browse the repository at this point in the history
Signed-off-by: Kent Rancourt <kent.rancourt@gmail.com>
  • Loading branch information
krancour committed Dec 5, 2024
1 parent cda7fee commit 68108d7
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions internal/directives/argocd_updater.go
Original file line number Diff line number Diff line change
Expand Up @@ -536,6 +536,15 @@ func (a *argocdUpdater) syncApplication(
for _, source := range app.Spec.Sources {
app.Operation.Sync.Revisions = append(app.Operation.Sync.Revisions, source.TargetRevision)
}
// TODO(krancour): This is a workaround for the Argo CD Application controller
// not handling this correctly itself. It is Argo CD's API server that usually
// handles this, but we are bypassing the API server here.
//
// See issue: https://github.com/argoproj/argo-cd/issues/20875
//
// We can remove this hack once the issue is resolved and all Argo CD versions
// without the fix have reached their EOL.
app.Status.OperationState = nil

// Patch the Argo CD Application.
if err := a.argoCDAppPatchFn(ctx, stepCtx, app, func(src, dst unstructured.Unstructured) error {
Expand Down

0 comments on commit 68108d7

Please sign in to comment.