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: 20791 - sync multi-source application out of order source syncs #21071

Merged
merged 1 commit into from
Dec 5, 2024
Merged

fix: 20791 - sync multi-source application out of order source syncs #21071

merged 1 commit into from
Dec 5, 2024

Conversation

ishitasequeira
Copy link
Member

Fixes #20791

Cherry-pick to 2.12 and 2.13 releases.

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
fix argoproj#20791 sync multi-source applications
fc7fe1d 
Signed-off-by: Ishita Sequeira <ishiseq29@gmail.com>
@ishitasequeira ishitasequeira requested a review from a team as a code owner December 5, 2024 07:07
@bunnyshell Bunnyshell
Copy link

bunnyshell bot commented Dec 5, 2024 •
edited
Loading

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

@ishitasequeira ishitasequeira mentioned this pull request Dec 5, 2024
Closed
3 tasks
@ishitasequeira ishitasequeira changed the title fix #20791 sync multi-source application out of order source syncs fix: 20791 - sync multi-source application out of order source syncs Dec 5, 2024
@codecov Codecov
Copy link

codecov bot commented Dec 5, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (master@522d07a). Learn more about missing BASE report.
Report is 407 commits behind head on master.

Additional details and impacted files 
@@            Coverage Diff            @@
##             master   #21071   +/-   ##
=========================================
  Coverage          ?   55.19%           
=========================================
  Files             ?      324           
  Lines             ?    55572           
  Branches          ?        0           
=========================================
  Hits              ?    30671           
  Misses            ?    22275           
  Partials          ?     2626

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

agaudreault
agaudreault approved these changes Dec 5, 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

@agaudreault agaudreault merged commit fa9023a into argoproj:master Dec 5, 2024
32 of 33 checks passed
@agaudreault
Copy link
Member

/cherry-pick release-2.13

gcp-cherry-pick-bot bot pushed a commit that referenced this pull request Dec 5, 2024
@ishitasequeira
fix: 20791 - sync multi-source application out of order source syncs (#…
6c2a3fd 
…21071)

Signed-off-by: Ishita Sequeira <ishiseq29@gmail.com>
@gcp-cherry-pick-bot gcp-cherry-pick-bot bot mentioned this pull request Dec 5, 2024
Merged
@agaudreault
Copy link
Member

/cherry-pick release-2.12

gcp-cherry-pick-bot bot pushed a commit that referenced this pull request Dec 5, 2024
@ishitasequeira
fix: 20791 - sync multi-source application out of order source syncs (#…
0e6e472 
…21071)

Signed-off-by: Ishita Sequeira <ishiseq29@gmail.com>
@gcp-cherry-pick-bot gcp-cherry-pick-bot bot mentioned this pull request Dec 5, 2024
Merged
agaudreault pushed a commit that referenced this pull request Dec 5, 2024
@gcp-cherry-pick-bot @ishitasequeira
fix: 20791 - sync multi-source application out of order source syncs …
01ae20d 
…(cherry-pick #21071) (#21077)

Signed-off-by: Ishita Sequeira <ishiseq29@gmail.com>
Co-authored-by: Ishita Sequeira <46771830+ishitasequeira@users.noreply.github.com>
agaudreault pushed a commit that referenced this pull request Dec 5, 2024
@gcp-cherry-pick-bot @ishitasequeira
fix: 20791 - sync multi-source application out of order source syncs …
05c1dd7 
…(cherry-pick #21071) (#21078)

Signed-off-by: Ishita Sequeira <ishiseq29@gmail.com>
Co-authored-by: Ishita Sequeira <46771830+ishitasequeira@users.noreply.github.com>
revitalbarletz pushed a commit to revitalbarletz/argo-cd that referenced this pull request Jan 20, 2025
@ishitasequeira @revitalbarletz
fix: 20791 - sync multi-source application out of order source syncs (a…
b3794fe 
…rgoproj#21071)

Signed-off-by: Ishita Sequeira <ishiseq29@gmail.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

@andrii-korotkov-verkada andrii-korotkov-verkada andrii-korotkov-verkada approved these changes

Assignees
No one assigned
Labels
ready-for-review
Projects
Argo CD Review
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Syncing sources in multi-source application depends on order of sources in spec.
3 participants
@ishitasequeira @agaudreault @andrii-korotkov-verkada