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.

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

fix: Policy/policy.open-cluster-management.io stuck in progressing status when no clusters match the policy (#21296) #21297

Merged
merged 1 commit into from
Jan 21, 2025
Merged

fix: Policy/policy.open-cluster-management.io stuck in progressing status when no clusters match the policy (#21296) #21297

merged 1 commit into from
Jan 21, 2025
+130 −1

Conversation

mbaldessari
Copy link
Contributor

When a policy does not apply to a cluster because the placementrule matches no cluster at all then the status will look like the following:

status:
  placement:
  - placementBinding: group-one-placement-binding
    placementRule: group-one-placement

Without this change the above will show up as progressing even though there is really nothing to progress.

Let's take care of this case by returning healthy when there is no compliant field but the array under placement is non-zero, which means that its placement resolution has happened and there is nothing to do.

Fixes: #21296

Ideally this should be backported to release-2.13 (only)

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.
  • [n/a] I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • [no] Does this PR require documentation updates?
  • [n/a] 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).
  • [n/a] 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).

@mbaldessari mbaldessari requested a review from a team as a code owner December 23, 2024 09:58
@bunnyshell Bunnyshell
Copy link

bunnyshell bot commented Dec 23, 2024 •
edited
Loading

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

@codecov Codecov
Copy link

codecov bot commented Dec 23, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (master@6f38327). Learn more about missing BASE report.
Report is 3 commits behind head on master.

Additional details and impacted files 
@@            Coverage Diff            @@
##             master   #21297   +/-   ##
=========================================
  Coverage          ?   55.40%           
=========================================
  Files             ?      339           
  Lines             ?    57172           
  Branches          ?        0           
=========================================
  Hits              ?    31676           
  Misses            ?    22788           
  Partials          ?     2708

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

dhaiducek
dhaiducek suggested changes Jan 2, 2025
View reviewed changes
Copy link

@dhaiducek dhaiducek left a comment

Choose a reason for hiding this comment

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

Thanks for the update, @mbaldessari!

FYI @JustinKuli

resource_customizations/policy.open-cluster-management.io/Policy/health.lua Outdated Show resolved Hide resolved
resource_customizations/policy.open-cluster-management.io/Policy/health.lua Outdated Show resolved Hide resolved
agaudreault
agaudreault reviewed Jan 13, 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.

@mbaldessari LGTM. Please address open comments. It can be merged after., 👍

@mbaldessari
Copy link
Contributor Author

Thanks for the feedback and apologies for the delay, I addressed both and rebased the PR while I was at it.

@dhaiducek
Copy link

@mbaldessari The conversations were marked resolved, but I don't see the requested updates here in the PR.

@mbaldessari
Copy link
Contributor Author

@mbaldessari The conversations were marked resolved, but I don't see the requested updates here in the PR.

Holy guacamole, I must have pushed the wrong thing. Apologies. Taking a look now

@mbaldessari
Copy link
Contributor Author

@mbaldessari The conversations were marked resolved, but I don't see the requested updates here in the PR.

Ok, now the right branch should be pushed up. Serves me well for doing it late at night I guess. Thanks for noticing and letting me know

dhaiducek
dhaiducek approved these changes Jan 20, 2025
View reviewed changes
Copy link

@dhaiducek dhaiducek left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks for the update, @mbaldessari! 😄

@dhaiducek
Copy link

Looks like this PR is blocked until this gets merged/resolved, though:

@mbaldessari
fix: Policy/policy.open-cluster-management.io stuck in progressing st…
ed16787 
…atus when no clusters match the policy (argoproj#21296)

When a policy does not apply to a cluster because the placementrule
matches no cluster at all then the status will look like the following:

    status:
      placement:
      - placementBinding: group-one-placement-binding
        placementRule: group-one-placement

Without this change the above will show up as progressing even though
there is really nothing to progress.

Let's take care of this case by returning healthy when there is no
compliant field but the array under placement is non-zero, which means
that its placement resolution has happened and there is nothing to do.

Fixes: argoproj#21296
Signed-off-by: Michele Baldessari <michele@acksyn.org>
@mbaldessari
Copy link
Contributor Author

Ah thanks for that info, I have rebased on top of that PR now that it merged. Let's see if this clears up CI

ishitasequeira
ishitasequeira approved these changes Jan 21, 2025
View reviewed changes
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!!

@ishitasequeira ishitasequeira merged commit ed3cc48 into argoproj:master Jan 21, 2025
27 checks passed
@ishitasequeira
Copy link
Member

/cherry-pick release-2.13

gcp-cherry-pick-bot bot pushed a commit that referenced this pull request Jan 21, 2025
@mbaldessari
fix: Policy/policy.open-cluster-management.io stuck in progressing st…
abe7bdd 
…atus when no clusters match the policy (#21296) (#21297)

Signed-off-by: Michele Baldessari <michele@acksyn.org>
@gcp-cherry-pick-bot gcp-cherry-pick-bot bot mentioned this pull request Jan 21, 2025
Merged
crenshaw-dev pushed a commit that referenced this pull request Jan 21, 2025
@gcp-cherry-pick-bot @mbaldessari
fix: Policy/policy.open-cluster-management.io stuck in progressing st…
99aaf43 
…atus when no clusters match the policy (#21296) (cherry-pick #21297) (#21594)

Signed-off-by: Michele Baldessari <michele@acksyn.org>
Co-authored-by: Michele Baldessari <michele@acksyn.org>
@ishitasequeira
Copy link
Member

/cherry-pick release-2.14

gcp-cherry-pick-bot bot pushed a commit that referenced this pull request Jan 21, 2025
@mbaldessari
fix: Policy/policy.open-cluster-management.io stuck in progressing st…
711c45a 
…atus when no clusters match the policy (#21296) (#21297)

Signed-off-by: Michele Baldessari <michele@acksyn.org>
@gcp-cherry-pick-bot gcp-cherry-pick-bot bot mentioned this pull request Jan 21, 2025
Merged
ishitasequeira pushed a commit that referenced this pull request Jan 22, 2025
@gcp-cherry-pick-bot @mbaldessari
fix: Policy/policy.open-cluster-management.io stuck in progressing st…
8a8fc37 
…atus when no clusters match the policy (#21296) (cherry-pick #21297) (#21614)

Signed-off-by: Michele Baldessari <michele@acksyn.org>
Co-authored-by: Michele Baldessari <michele@acksyn.org>
dudo pushed a commit to dudo/argo-cd that referenced this pull request Jan 25, 2025
@mbaldessari @dudo
fix: Policy/policy.open-cluster-management.io stuck in progressing st…
c22bb06 
…atus when no clusters match the policy (argoproj#21296) (argoproj#21297)

Signed-off-by: Michele Baldessari <michele@acksyn.org>
Signed-off-by: Brett C. Dudo <brett@dudo.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@agaudreault agaudreault agaudreault left review comments

@andrii-korotkov-verkada andrii-korotkov-verkada andrii-korotkov-verkada approved these changes

@ishitasequeira ishitasequeira ishitasequeira approved these changes

@dhaiducek dhaiducek dhaiducek approved these changes

Assignees
No one assigned
Labels
ready-for-review
Projects
Argo CD Review
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Policy/policy.open-cluster-management.io is in Progressing state even though there is nothing to do
5 participants
@mbaldessari @dhaiducek @ishitasequeira @agaudreault @andrii-korotkov-verkada