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): fix(controller): make app patch affect status.operationState #3105

Merged
merged 2 commits into from
Dec 9, 2024
Merged

chore(backport release-1.1): fix(controller): make app patch affect status.operationState #3105

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6908fdc
fix(controller): make app patch affect status.operationState (#3104)
krancour Dec 9, 2024
128589a
Merge branch 'release-1.1' into backport-3104-to-release-1.1
krancour Dec 9, 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
12 changes: 12 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 @@ -537,6 +537,18 @@
dst.SetAnnotations(src.GetAnnotations())
dst.Object["spec"] = a.recursiveMerge(src.Object["spec"], dst.Object["spec"])
dst.Object["operation"] = src.Object["operation"]
// 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.
//
// nolint: forcetypeassert
dst.Object["status"].(map[string]any)["operationState"] =
src.Object["status"].(map[string]any)["operationState"]

Check warning on line 551 in internal/directives/argocd_updater.go

View check run for this annotation

Codecov / codecov/patch

internal/directives/argocd_updater.go#L540-L551 

Added lines #L540 - L551 were not covered by tests
return nil
}); err != nil {
return fmt.Errorf("error patching Argo CD Application %q: %w", app.Name, err)
Expand Down
Loading