8000 fix(controller): only update lastTransitionTime when needed by crenshaw-dev · Pull Request #23018 · argoproj/argo-cd · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix(controller): only update lastTransitionTime when needed #23018

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
May 20, 2025
Merged

fix(controller): only update lastTransitionTime when needed #23018

merged 2 commits into from
May 20, 2025

Conversation

crenshaw-dev
Copy link
Member

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

@bunnyshell Bunnyshell
Copy link
bunnyshell bot commented May 16, 2025 •
edited
Loading

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

@crenshaw-dev crenshaw-dev force-pushed the do-not-reuse-structs branch 2 times, most recently from 6d652f8 to e4701b3 Compare May 16, 2025 21:44
@crenshaw-dev crenshaw-dev mentioned this pull request May 16, 2025
Closed
3 tasks
@crenshaw-dev crenshaw-dev force-pushed the do-not-reuse-structs branch from e4701b3 to 3494413 Compare May 17, 2025 16:28
@codecov Codecov
Copy link
codecov bot commented May 17, 2025 •
edited
Loading

Codecov Report

Attention: Patch coverage is 94.73684% with 1 line in your changes missing coverage. Please review.

Project coverage is 60.00%. Comparing base (797f1d6) to head (d190760).
Report is 18 commits behind head on master.

Files with missing lines Patch % Lines
controller/state.go 66.66% 1 Missing ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##           master   #23018      +/-   ##
==========================================
- Coverage   60.00%   60.00%   -0.01%     
==========================================
  Files         343      343              
  Lines       57848    57847       -1     
==========================================
- Hits        34714    34710       -4     
- Misses      20358    20362       +4     
+ Partials     2776     2775       -1

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

@crenshaw-dev
fix(controller): only update lastTransitionTime when needed
8233906 
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

fix tests

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

fix tests

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

fix tests

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

fix tests, lint

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

lint

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
@crenshaw-dev crenshaw-dev force-pushed the do-not-reuse-structs branch from 3494413 to 8233906 Compare May 17, 2025 17:27
@agaudreault agaudreault marked this pull request as ready for review May 19, 2025 15:32
@agaudreault agaudreault requested a review from a team as a code owner May 19, 2025 15:32
agaudreault
agaudreault reviewed May 19, 2025
View reviewed changes
pkg/apis/application/v1alpha1/types.go Outdated
Comment on lines 1793 to 1794
// Message is a human-readable informational message describing the health status
Message string `json:"message,omitempty" protobuf:"bytes,2,opt,name=message"`
Copy link
Member

Choose a reason for hiding this comment

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

Add back the field as deprecated just so the protobuf byte is reserved.

agaudreault
agaudreault reviewed May 19, 2025
View reviewed changes
rumstead
rumstead reviewed May 19, 2025
View reviewed changes
pkg/apis/application/v1alpha1/types.go Outdated
@@ -1787,15 +1787,20 @@ type SyncStatus struct {
}

// HealthStatus contains information about the currently observed health state of an application or resource
Copy link
Member

Choose a reason for hiding this comment

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

super nit

Suggested change
// HealthStatus contains information about the currently observed health state of an application or resource
// AppHealthStatus contains information about the currently observed health state of an application or resource

@rumstead
Copy link
Member

From my understanding, you are breaking HealthResource struct by app and resource. I guess that caused some issues when normalizing?

@crenshaw-dev crenshaw-dev marked this pull request as draft May 19, 2025 16:08
@crenshaw-dev
Copy link
Member Author

@rumstead sharing a single field just made the code very confusing. The actual bug is that we update lastTransitionTime when we shouldn't.

I'm going to update the PR to make the changes minimal and backwards-compatible. Then I'm going to make an even more minimal 2.14 cherry-pick to just solve the bug with no other changes.

@agaudreault agaudreault mentioned this pull request May 19, 2025
Merged
@crenshaw-dev crenshaw-dev force-pushed the do-not-reuse-structs branch 2 times, most recently from f8dcda3 to 39968f9 Compare May 19, 2025 20:01
@crenshaw-dev
deprecate fields, rename for simplicity
d190760 
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

comment

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

simplify, better test

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

e2e test

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

remove unnecessary test - covered elsewhere'

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
@crenshaw-dev crenshaw-dev force-pushed the do-not-reuse-structs branch from 39968f9 to d190760 Compare May 19, 2025 21:03
@crenshaw-dev crenshaw-dev marked this pull request as ready for review May 20, 2025 14:47
agaudreault
agaudreault approved these changes May 20, 2025
View reviewed changes
Copy link
Member
@agaudreault agaudreault left a comment

Choose a reason for hiding this comment

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

LGTM. From my understanding, the change to the protobuf should be backward compatible too.

@crenshaw-dev crenshaw-dev merged commit 45a8c68 into argoproj:master May 20, 2025
40 of 41 checks passed
@agaudreault agaudreault mentioned this pull request May 20, 2025
Merged
14 tasks
LyhengTep pushed a commit to LyhengTep/argo-cd that referenced this pull request May 24, 2025
@crenshaw-dev @LyhengTep
fix(controller): only update lastTransitionTime when needed (argoproj…
2c0f69a 
…#23018)

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Signed-off-by: Lyheng <lyhengtep@gmail.com>
tylerrosnett pushed a commit to StateFarmIns/argo-cd that referenced this pull request May 27, 2025
@crenshaw-dev @tylerrosnett
fix(controller): only update lastTransitionTime when needed (argoproj…
1be87d9 
…#23018)

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
@alexymantha alexymantha mentioned this pull request May 28, 2025
Merged
chansuke pushed a commit to chansuke/argo-cd that referenced this pull request Jun 4, 2025
@crenshaw-dev @chansuke
fix(controller): only update lastTransitionTime when needed (argoproj…
923ac6e 
…#23018)

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
dsuhinin pushed a commit to dsuhinin/argo-cd that referenced this pull request Jun 16, 2025
@crenshaw-dev @dsuhinin
fix(controller): only update lastTransitionTime when needed (argoproj…
5a95ef6 
…#23018)

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Signed-off-by: dsuhinin <suhinin.dmitriy@gmail.com>
dsuhinin pushed a commit to dsuhinin/argo-cd that referenced this pull request Jun 16, 2025
@crenshaw-dev @dsuhinin
fix(controller): only update lastTransitionTime when needed (argoproj…
e4b95e2 
…#23018)

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Signed-off-by: dsuhinin <suhinin.dmitriy@gmail.com>
dsuhinin pushed a commit to dsuhinin/argo-cd that referenced this pull request Jun 16, 2025
@crenshaw-dev @dsuhinin
fix(controller): only update lastTransitionTime when needed (argoproj…
c310125 
…#23018)

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Signed-off-by: dsuhinin <suhinin.dmitriy@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rumstead rumstead rumstead left review comments

@agaudreault agaudreault agaudreault 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.
3 participants
@crenshaw-dev @rumstead @agaudreault
0