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.

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

fix: fix source ordering issue in manifest generation for multi-source app while using manifests and diff commands #18395

Conversation

ishitasequeira
Copy link
Member

Fixes #18359.

To be cherry-picked in 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).

… while using manifests and diff commands

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>
@ishitasequeira ishitasequeira requested a review from a team as a code owner May 24, 2024 03:17
Copy link

codecov bot commented May 24, 2024

Codecov Report

Attention: Patch coverage is 60.00000% with 2 lines in your changes are missing coverage. Please review.

Project coverage is 44.94%. Comparing base (a95d595) to head (0043867).
Report is 1 commits behind head on master.

Files Patch % Lines
server/application/application.go 60.00% 2 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##           master   #18395   +/-   ##
=======================================
  Coverage   44.94%   44.94%           
=======================================
  Files         354      354           
  Lines       47739    47740    +1     
=======================================
+ Hits        21454    21455    +1     
  Misses      23482    23482           
  Partials     2803     2803           

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

Copy link
Collaborator

@alexmt alexmt left a comment

Choose a reason for hiding this comment

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

LGTM. thank you!

@ishitasequeira ishitasequeira merged commit d871b7f into argoproj:master May 24, 2024
28 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 24, 2024
ishitasequeira pushed a commit that referenced this pull request May 24, 2024
rumstead pushed a commit to rumstead/argo-cd that referenced this pull request Jun 6, 2024
… while using manifests and diff commands (argoproj#18395)

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>
mkieweg pushed a commit to mkieweg/argo-cd that referenced this pull request Jun 11, 2024
Hariharasuthan99 pushed a commit to AmadeusITGroup/argo-cd that referenced this pull request Jun 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

The order of sources (git/helm) in multi-source application matters in case of app diff & manifests features
2 participants