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

Jump to bottom

fix: use cmp vs reflect.DeepEqual for comparing Applications (#17861) #17940

Merged
merged 5 commits into from
Apr 23, 2024
Merged

fix: use cmp vs reflect.DeepEqual for comparing Applications (#17861) #17940

merged 5 commits into from
Apr 23, 2024

Conversation

rumstead
Copy link
Member

closes #17861

reflect.DeepEqual considers nil slices/maps not equal to empty slices/maps. Since the Applications are considered different, the ApplicationSet will be requeued. Applications are being updated by the Application Controller (or other things) that initially caused the change in the Application.

https://pkg.go.dev/reflect#DeepEqual

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • The title of the PR conforms to the Toolchain Guide
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).
  • My new feature complies with the feature status guidelines.
  • I have added a brief description of why this PR is necessary and/or what this PR solves.
  • Optional. My organization is added to USERS.md.
  • Optional. For bug fixes, I've indicated what older releases this fix should be cherry-picked into (this may or may not happen depending on risk/complexity).

@rumstead
fix(compare): appset compare the child apps with cmp vs reflect
61cec2c 
Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>
@rumstead
Merge branch 'master' of github.com:argoproj/argo-cd into fix/compare…
4ca1efb 
…-application-with-cmp
@rumstead
remove debug lines
af2cbb2 
Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>
@rumstead
remove debug lines
b94cd05 
Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>
@rumstead rumstead requested a review from a team as a code owner April 23, 2024 17:57
@rumstead rumstead changed the title Fix: use cmp vs reflect.DeepEqual for comparing Applications (#17861) fix: use cmp vs reflect.DeepEqual for comparing Applications (#17861) Apr 23, 2024
crenshaw-dev
crenshaw-dev approved these changes Apr 23, 2024
View reviewed changes
Copy link
Member

@crenshaw-dev crenshaw-dev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, @rumstead!

@crenshaw-dev crenshaw-dev enabled auto-merge (squash) April 23, 2024 20:47
@crenshaw-dev crenshaw-dev merged commit 1eec8eb into argoproj:master Apr 23, 2024
27 checks passed
@rumstead rumstead deleted the fix/compare-application-with-cmp branch April 23, 2024 21:10
@crenshaw-dev
Copy link
Member

/cherry-pick release-2.11

gcp-cherry-pick-bot bot pushed a commit that referenced this pull request Apr 24, 2024
@rumstead
fix: use cmp vs reflect.DeepEqual for comparing Applications (#17861) (…
6c099bd 
…#17940)

* fix(compare): appset compare the child apps with cmp vs reflect

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>

* remove debug lines

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>

* remove debug lines

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>

---------

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>
@gcp-cherry-pick-bot gcp-cherry-pick-bot bot mentioned this pull request Apr 24, 2024
Merged
crenshaw-dev pushed a commit that referenced this pull request Apr 24, 2024
@gcp-cherry-pick-bot @rumstead
fix: use cmp vs reflect.DeepEqual for comparing Applications (#17861) (…
9f186da 
…#17940) (#17958)

* fix(compare): appset compare the child apps with cmp vs reflect



* remove debug lines



* remove debug lines



---------

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>
Co-authored-by: rumstead <37445536+rumstead@users.noreply.github.com>
mkieweg pushed a commit to mkieweg/argo-cd that referenced this pull request Jun 11, 2024
@rumstead @mkieweg
fix: use cmp vs reflect.DeepEqual for comparing Applications (argopro…
d3d8f37 
…j#17861) (argoproj#17940)

* fix(compare): appset compare the child apps with cmp vs reflect

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>

* remove debug lines

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>

* remove debug lines

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>

---------

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>
Hariharasuthan99 pushed a commit to AmadeusITGroup/argo-cd that referenced this pull request Jun 16, 2024
@rumstead @Hariharasuthan99
fix: use cmp vs reflect.DeepEqual for comparing Applications (argopro…
4030db7 
…j#17861) (argoproj#17940)

* fix(compare): appset compare the child apps with cmp vs reflect

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>

* remove debug lines

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>

* remove debug lines

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>

---------

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@crenshaw-dev crenshaw-dev crenshaw-dev approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

ApplicationSet reconcilation: requeueAfterSeconds not respected
2 participants
@rumstead @crenshaw-dev