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: correct lookup for the kustomization file when applying patches (cherry-pick #22024) #22087

Merged
merged 3 commits into from
Feb 28, 2025
Merged

fix: correct lookup for the kustomization file when applying patches (cherry-pick #22024) #22087

merged 3 commits into from
Feb 28, 2025

Conversation

nitishfy
Copy link
Member

Cherry pick #22024

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

nitishfy and others added 2 commits February 28, 2025 20:44
@nitishfy @crenshaw-dev
fix: correct lookup for the kustomization file when applying patches (a…
007a0c7 
…rgoproj#22024)

Signed-off-by: nitishfy <justnitish06@gmail.com>
Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
@nitishfy
use fmt package for error handling
68a08e7 
Signed-off-by: nitishfy <justnitish06@gmail.com>
@nitishfy nitishfy requested a review from a team as a code owner February 28, 2025 15:15
@nitishfy nitishfy mentioned this pull request Feb 28, 2025
Closed
nitishfy
nitishfy commented Feb 28, 2025
View reviewed changes
Copy link
Member Author

@nitishfy nitishfy left a comment

Choose a reason for hiding this comment

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

For someone merging this one, Please don't care about the code-generation check failing for cherry-pick fails as we don't want to update our manifests to the latest version when cherry-picking.

@gdsoumya gdsoumya merged commit 6ef7f61 into argoproj:release-2.13 Feb 28, 2025
18 of 19 checks passed
@nitishfy nitishfy deleted the kustomize-cherry-pick-2.13 branch February 28, 2025 16:10
@codecov Codecov
Copy link

codecov bot commented Feb 28, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 55.04%. Comparing base (c7937f1) to head (d49c427).
Report is 1 commits behind head on release-2.13.

Additional details and impacted files 
@@               Coverage Diff                @@
##           release-2.13   #22087      +/-   ##
================================================
+ Coverage         55.01%   55.04%   +0.02%     
================================================
  Files               320      320              
  Lines             54843    54856      +13     
================================================
+ Hits              30173    30196      +23     
+ Misses            22075    22066       -9     
+ Partials           2595     2594       -1

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gdsoumya gdsoumya gdsoumya 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.
2 participants
@nitishfy @gdsoumya