Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(backport release-1.1): chore: clear app status op state #3073

Merged
merged 2 commits into from
Dec 5, 2024
Merged

chore(backport release-1.1): chore: clear app status op state #3073

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3ac385
chore: clear app status op state (#3069)
krancour Dec 5, 2024
b4f3efe
Merge branch 'release-1.1' into backport-3069-to-release-1.1
hiddeco Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions internal/directives/argocd_updater.go
View file
Open in desktop
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
Loading