Skip to content

fix: fixing back cherry-pick commit for #20222 #22634

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
Merged
merged 2 commits into from
Apr 11, 2025
Merged

fix: fixing back cherry-pick commit for #20222 #22634

merged 2 commits into from
Apr 11, 2025

Conversation

alexmt
Copy link
Collaborator

@alexmt alexmt commented Apr 10, 2025

PR adds missing changes for a cherry-pick PR #20222 (support managing cluster with multiple argocd instances)

3 lines of code were missed during cherry-picking in getAppInstanceValue method changes.

Original PR changes:

image

Cherry-pick PR:

image

@alexmt alexmt requested a review from a team as a code owner April 10, 2025 20:15
nitishfy
nitishfy suggested changes Apr 11, 2025
View reviewed changes
Copy link
Member

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

can you pass the failing checks except the code generation check?

@dependabot @alexmt
chore(deps): bump actions/cache from 4.1.2 to 4.2.0 (argoproj#21084)
9db4d83 
Bumps [actions/cache](https://github.com/actions/cache) from 4.1.2 to 4.2.0.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](actions/cache@6849a64...1bd1e32)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@alexmt alexmt requested a review from a team as a code owner April 11, 2025 23:05
@alexmt
Copy link
Collaborator Author

alexmt commented Apr 11, 2025

@nitishfy, Looks like old cache action is no longer available. Cherry-picked #21084 into this PR as well.

@alexmt alexmt merged commit 9f6924b into argoproj:release-2.12 Apr 11, 2025
16 of 18 checks passed
@alexmt alexmt deleted the bad-cherry-pick-fix branch April 11, 2025 23:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nitishfy nitishfy nitishfy requested changes

@christianh814 christianh814 christianh814 approved these changes

@jessesuen jessesuen jessesuen approved these changes

@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.
5 participants
@alexmt @christianh814 @jessesuen @gdsoumya @nitishfy