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

fix(hydrator): refresh by annotation instead of work queue #22016

Merged

Conversation

crenshaw-dev
Copy link
Member

@crenshaw-dev crenshaw-dev commented Feb 25, 2025

Fixes #22055

Instead of putting the app directly on the refresh queue, use the refresh annotation. This ensures that the correct controller shard picks up the refresh operation.

Verified

This commit was signed with the committer’s verified signature.
crenshaw-dev Michael Crenshaw
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Copy link

bunnyshell bot commented Feb 25, 2025

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

Copy link

codecov bot commented Feb 25, 2025

Codecov Report

Attention: Patch coverage is 35.29412% with 11 lines in your changes missing coverage. Please review.

Project coverage is 53.55%. Comparing base (3baca9b) to head (f87d3f0).
Report is 6 commits behind head on master.

Files with missing lines Patch % Lines
controller/hydrator_dependencies.go 0.00% 6 Missing ⚠️
controller/hydrator/hydrator.go 0.00% 4 Missing ⚠️
pkg/apis/application/v1alpha1/types.go 0.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master   #22016      +/-   ##
==========================================
- Coverage   55.73%   53.55%   -2.18%     
==========================================
  Files         342      342              
  Lines       57075    57111      +36     
==========================================
- Hits        31809    30587    -1222     
- Misses      22622    23925    +1303     
+ Partials     2644     2599      -45     

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

lint

Verified

This commit was signed with the committer’s verified signature.
crenshaw-dev Michael Crenshaw
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

Verified

This commit was signed with the committer’s verified signature.
crenshaw-dev Michael Crenshaw
…-annotation

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

Verified

This commit was signed with the committer’s verified signature.
crenshaw-dev Michael Crenshaw
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

Verified

This commit was signed with the committer’s verified signature.
crenshaw-dev Michael Crenshaw
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
@crenshaw-dev crenshaw-dev marked this pull request as ready for review February 27, 2025 17:27
@crenshaw-dev crenshaw-dev requested a review from a team as a code owner February 27, 2025 17:27

Verified

This commit was signed with the committer’s verified signature.
crenshaw-dev Michael Crenshaw
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

Verified

This commit was signed with the committer’s verified signature.
crenshaw-dev Michael Crenshaw
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

Verified

This commit was signed with the committer’s verified signature.
crenshaw-dev Michael Crenshaw
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
@crenshaw-dev crenshaw-dev merged commit 8a97c1d into argoproj:master Feb 27, 2025
26 of 27 checks passed
@crenshaw-dev
Copy link
Member Author

/cherry-pick release-2.14

Copy link

Cherry-pick failed with Merge error 8a97c1d138b4c7fe0c19af284f753b69cb4dda95 into temp-cherry-pick-3d49a2-release-2.14

crenshaw-dev added a commit to crenshaw-dev/argo-cd that referenced this pull request Feb 27, 2025

Verified

This commit was signed with the committer’s verified signature.
crenshaw-dev Michael Crenshaw
…22016)

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

Cherry-picking here: #22067

@crenshaw-dev crenshaw-dev deleted the hydrator-refresh-by-annotation branch February 27, 2025 19:31
crenshaw-dev added a commit that referenced this pull request Feb 27, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
…22067)

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
chzar pushed a commit to chzar/argo-cd that referenced this pull request Mar 3, 2025

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
…22016)

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
kingbj940429 pushed a commit to kingbj940429/argo-cd that referenced this pull request Mar 4, 2025

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
…22016)

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Signed-off-by: kingbj0429 <kingbj0429@lunit.io>
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.

App using source hydrator goes into unknown state with "controller is configured to ignore cluster"
2 participants