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: update resolveRevision to use the correct source for multi-source app #18194

Merged
merged 2 commits into from
May 13, 2024
Merged

fix: update resolveRevision to use the correct source for multi-source app #18194

merged 2 commits into from
May 13, 2024

Conversation

ishitasequeira
Copy link
Member

@ishitasequeira ishitasequeira commented May 13, 2024 •
edited
Loading

Fixes #18120

cherry-pick release-2.11

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).

@ishitasequeira
update resolveRevision to use the correct source for multi-source app
3127dd0 
Signed-off-by: ishitasequeira <ishiseq29@gmail.com>
@ishitasequeira ishitasequeira requested a review from a team as a code owner May 13, 2024 13:23
@ishitasequeira ishitasequeira changed the title update resolveRevision to use the correct source for multi-source app fix: update resolveRevision to use the correct source for multi-source app May 13, 2024
agaudreault
agaudreault approved these changes May 13, 2024
View reviewed changes
Copy link
Member

@agaudreault agaudreault left a comment

Choose a reason for hiding this comment

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

LGTM

todaywasawesome
todaywasawesome approved these changes May 13, 2024
View reviewed changes
Copy link
Contributor

@todaywasawesome todaywasawesome left a comment

Choose a reason for hiding this comment

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

Looks good.

I'm a little unclear why the regression is in 2.11 and not earlier versions though we didn't previously try to handle sourceIndex on the sources. Should we cherry-pick this back to 2.10 and 2.9?

@todaywasawesome
Copy link
Contributor

/cherry-pick 2.10
/cherry-pick 2.9

@ishitasequeira
Copy link
Member Author

Hey @todaywasawesome, the change for supporting sync for multi-source apps went in 2.11 release. We have been defaulting to the 1st source details alone for earlier versions.

Reference PR: #17808

@pasha-codefresh pasha-codefresh merged commit 710bb76 into argoproj:master May 13, 2024
28 of 29 checks passed
@ishitasequeira
Copy link
Member Author

/cherry-pick release-2.11

gcp-cherry-pick-bot bot pushed a commit that referenced this pull request May 13, 2024
@ishitasequeira
update resolveRevision to use the correct source for multi-source app (…
52b0ee1 
…#18194)
@gcp-cherry-pick-bot gcp-cherry-pick-bot bot mentioned this pull request May 13, 2024
Merged
@wanddynosios
Copy link

Can confirm that this fixed the issue for me👍

@sassdavid sassdavid mentioned this pull request May 16, 2024
Closed
3 tasks
pasha-codefresh pushed a commit that referenced this pull request May 20, 2024
@gcp-cherry-pick-bot @ishitasequeira
update resolveRevision to use the correct source for multi-source app (…
37dd289 
…#18194) (#18202)

Co-authored-by: Ishita Sequeira <46771830+ishitasequeira@users.noreply.github.com>
mkieweg pushed a commit to mkieweg/argo-cd that referenced this pull request Jun 11, 2024
@ishitasequeira @mkieweg
update resolveRevision to use the correct source for multi-source app (…
498024d 
…argoproj#18194)
Hariharasuthan99 pushed a commit to AmadeusITGroup/argo-cd that referenced this pull request Jun 16, 2024
@ishitasequeira @Hariharasuthan99
update resolveRevision to use the correct source for multi-source app (…
374b712 
…argoproj#18194)
jsolana pushed a commit to jsolana/argo-cd that referenced this pull request Jul 24, 2024
@ishitasequeira
update resolveRevision to use the correct source for multi-source app (…
50a807f 
…argoproj#18194)

Signed-off-by: Javier Solana <javier.solana@cabify.com>
Signed-off-by: Javier Solana <javier.solana@cabify.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@agaudreault agaudreault agaudreault approved these changes

@pasha-codefresh pasha-codefresh pasha-codefresh approved these changes

@todaywasawesome todaywasawesome todaywasawesome 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.

Sync from UI for Multi source application stopped working on v2.11.0
5 participants
@ishitasequeira @todaywasawesome @wanddynosios @pasha-codefresh @agaudreault