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

chore: Consume cluster cache deadlock fix from gitops-engine [release-2.6] #13613

Merged

Conversation

jaideepr97
Copy link
Contributor

This PR just consumes argoproj/gitops-engine#521 from gitops-engine into argo-cd, which addresses #11458

Note on DCO:

If the DCO action in the integration test fails, one or more of your commits are not signed off. Please click on the Details link next to the DCO action for instructions on how to resolve this.

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.
  • Optional. My organization is added to USERS.md.
  • 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.

Please see Contribution FAQs if you have questions about your pull-request.

@alexmt
Copy link
Collaborator

alexmt commented May 16, 2023

we should cherry-pick #13611 instead, to avoid merge conflicts

@jaideepr97 jaideepr97 force-pushed the consume-latest-gitops-engine-2.6 branch from 37e894e to 2065e98 Compare May 16, 2023 18:12
Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>
@jaideepr97 jaideepr97 force-pushed the consume-latest-gitops-engine-2.6 branch from 2065e98 to 9021f04 Compare May 16, 2023 18:19
@codecov
Copy link

codecov bot commented May 16, 2023

Codecov Report

Patch and project coverage have no change.

Comparison is base (6f5eaff) 48.55% compared to head (9021f04) 48.55%.

Additional details and impacted files
@@             Coverage Diff              @@
##           release-2.6   #13613   +/-   ##
============================================
  Coverage        48.55%   48.55%           
============================================
  Files              246      246           
  Lines            41777    41777           
============================================
  Hits             20285    20285           
  Misses           19431    19431           
  Partials          2061     2061           

see 1 file with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@crenshaw-dev crenshaw-dev merged commit 62ae79a into argoproj:release-2.6 May 17, 2023
15 of 17 checks passed
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.

None yet

3 participants