Skip to content

fix: [cherry-pick] selfhealattemptscount needs to be reset at times (#22095, #20978)#22583

Merged
rumstead merged 2 commits intoargoproj:release-2.14from
Aaron-9900:cherry-pick-e6f94f-release-2.14
Apr 7, 2025
Merged

fix: [cherry-pick] selfhealattemptscount needs to be reset at times (#22095, #20978)#22583
rumstead merged 2 commits intoargoproj:release-2.14from
Aaron-9900:cherry-pick-e6f94f-release-2.14

Conversation

@Aaron-9900
Copy link
Copy Markdown
Contributor

@Aaron-9900 Aaron-9900 commented Apr 7, 2025

Cherry picks: #20978 and #22095

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

@Aaron-9900 Aaron-9900 force-pushed the cherry-pick-e6f94f-release-2.14 branch from 0bfc127 to 4a37561 Compare April 7, 2025 09:20
@Aaron-9900 Aaron-9900 changed the title fix: [cherry-pick] selfhealattemptscount needs to be reset at times (#22095) fix: [cherry-pick] selfhealattemptscount needs to be reset at times (#22095, #20978) Apr 7, 2025
mrysavy and others added 2 commits April 7, 2025 11:35
…goproj#20976) (argoproj#20978)

* test: fix TestSelfHealExponentialBackoff to test exceeding Backoff.Cap

Signed-off-by: Michal Ryšavý <michal.rysavy@ext.csas.cz>

* fix: fix calculating SelfHealBackOff delay when exceeding maximum

Signed-off-by: Michal Ryšavý <michal.rysavy@ext.csas.cz>

Signed-off-by: Michal Ryšavý <mrysavy@users.noreply.github.com>

---------

Signed-off-by: Michal Ryšavý <michal.rysavy@ext.csas.cz>
Co-authored-by: Michal Ryšavý <michal.rysavy@ext.csas.cz>
…rgoproj#22095)

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>
@Aaron-9900 Aaron-9900 force-pushed the cherry-pick-e6f94f-release-2.14 branch from 4a37561 to bf976cc Compare April 7, 2025 09:36
@Aaron-9900 Aaron-9900 marked this pull request as ready for review April 7, 2025 09:39
@Aaron-9900 Aaron-9900 requested a review from a team as a code owner April 7, 2025 09:39
Copy link
Copy Markdown
Member

@blakepettersson blakepettersson left a comment

Choose a reason for hiding this comment

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

LGTM

@blakepettersson blakepettersson added the ready-for-review An approver should give a final review and merge the PR label Apr 7, 2025
@github-project-automation github-project-automation bot moved this to Ready for final review in Argo CD Review Apr 7, 2025
@codecov
Copy link
Copy Markdown

codecov bot commented Apr 7, 2025

Codecov Report

Attention: Patch coverage is 72.22222% with 5 lines in your changes missing coverage. Please review.

Project coverage is 55.29%. Comparing base (38985bd) to head (bf976cc).
Report is 34 commits behind head on release-2.14.

Files with missing lines Patch % Lines
controller/appcontroller.go 72.22% 4 Missing and 1 partial ⚠️
Additional details and impacted files
@@               Coverage Diff                @@
##           release-2.14   #22583      +/-   ##
================================================
- Coverage         55.30%   55.29%   -0.01%     
================================================
  Files               339      339              
  Lines             57335    57341       +6     
================================================
- Hits              31707    31705       -2     
  Misses            22936    22936              
- Partials           2692     2700       +8     

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

@rumstead rumstead merged commit 6b15a04 into argoproj:release-2.14 Apr 7, 2025
33 of 36 checks passed
@github-project-automation github-project-automation bot moved this from Ready for final review to Done in Argo CD Review Apr 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ready-for-review An approver should give a final review and merge the PR

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

4 participants