Skip to content

Conversation

@lplazas
Copy link
Contributor

@lplazas lplazas commented Sep 28, 2025

Fixes: #24740
This bug was introduced in v2.14.0 and has been in every v2.14 and v3 release ever since.

To note
All the test cases pass with the pre-v2.14 version with one notable exception: https://github.com/argoproj/argo-cd/pull/24769/files#diff-f4cf5d4ad87bc07ff0573f18f4b68af0adf34871c09b32eae1554b3334e5a93cR183

time.ParseDuration allows for decimal durations (1.5h, 5.5m, etc), while the old function didn't.

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 Title of the PR
  • 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).

@bunnyshell
Copy link

bunnyshell bot commented Sep 28, 2025

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

@lplazas lplazas force-pushed the fix/time-duration-parsing-v2-14 branch from a1c1432 to 51c5cfa Compare September 28, 2025 14:15
@lplazas lplazas changed the title fix: allow for backwards compatibility of durations defined in days fix: allow for backwards compatibility of durations defined in days (24740) Sep 28, 2025
@lplazas lplazas force-pushed the fix/time-duration-parsing-v2-14 branch from 51c5cfa to bd2d697 Compare September 28, 2025 14:23
@lplazas lplazas marked this pull request as ready for review September 28, 2025 14:23
@lplazas lplazas requested a review from a team as a code owner September 28, 2025 14:23
@lplazas
Copy link
Contributor Author

lplazas commented Sep 28, 2025

@crenshaw-dev for visibility

@lplazas lplazas force-pushed the fix/time-duration-parsing-v2-14 branch from bd2d697 to 319363f Compare September 28, 2025 17:39
@blakepettersson blakepettersson changed the title fix: allow for backwards compatibility of durations defined in days (24740) fix: allow for backwards compatibility of durations defined in days Sep 28, 2025
@blakepettersson blakepettersson added cherry-pick/3.0 Candidate for cherry picking into the 3.0 release branch cherry-pick/3.1 Candidate for cherry picking into the 3.1 release branch cherry-pick/2.14 Candidate for cherry picking into the 2.14 release branch labels Sep 28, 2025
Copy link
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

@codecov
Copy link

codecov bot commented Sep 28, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 60.70%. Comparing base (31088be) to head (319363f).
⚠️ Report is 2 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master   #24769   +/-   ##
=======================================
  Coverage   60.70%   60.70%           
=======================================
  Files         404      404           
  Lines       66092    66096    +4     
=======================================
+ Hits        40121    40125    +4     
- Misses      22722    22723    +1     
+ Partials     3249     3248    -1     

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

Copy link
Member

@ishitasequeira ishitasequeira 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 merged commit bc811c5 into argoproj:master Sep 28, 2025
59 of 65 checks passed
@argo-cd-cherry-pick-bot
Copy link

🍒 Cherry-pick PR created for 3.0: #24770

@argo-cd-cherry-pick-bot
Copy link

🍒 Cherry-pick PR created for 3.1: #24771

@argo-cd-cherry-pick-bot
Copy link

🍒 Cherry-pick PR created for 2.14: #24772

nitishfy pushed a commit that referenced this pull request Sep 29, 2025
…cherry-pick #24769 for 3.1) (#24771)

Signed-off-by: lplazas <[email protected]>
Co-authored-by: lplazas <[email protected]>
nitishfy pushed a commit that referenced this pull request Sep 29, 2025
…cherry-pick #24769 for 3.0) (#24770)

Signed-off-by: lplazas <[email protected]>
Co-authored-by: lplazas <[email protected]>
crenshaw-dev pushed a commit that referenced this pull request Sep 29, 2025
…cherry-pick #24769 for 2.14) (#24772)

Signed-off-by: lplazas <[email protected]>
Co-authored-by: lplazas <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cherry-pick/2.14 Candidate for cherry picking into the 2.14 release branch cherry-pick/3.0 Candidate for cherry picking into the 3.0 release branch cherry-pick/3.1 Candidate for cherry picking into the 3.1 release branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Silent breaking change in timeout.reconciliation introduced since v2.14.0

3 participants