Skip to content

Revert "fix(chart): only create ServiceMonitor if cluster supports it (#7926) #8913

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 3 commits into from
Nov 16, 2023
Merged

Revert "fix(chart): only create ServiceMonitor if cluster supports it (#7926) #8913

merged 3 commits into from
Nov 16, 2023

Conversation

treydock
Copy link
Contributor

This reverts commit 590dce5.

This will ensure servicemonitor can be enabled with ArgoCD which doesn't support querying API capabilities

Fixes #8891

@treydock
Revert "fix(chart): only create ServiceMonitor if cluster supports it (…
a4db034 
…kyverno#7926)"

This reverts commit 590dce5.

This will ensure servicemonitor can be enabled with ArgoCD which doesn't support querying API capabilities

Fixes kyverno#8891

Signed-off-by: Trey Dockendorf <tdockendorf@osc.edu>
@treydock treydock requested a review from eddycharly as a code owner November 15, 2023 15:47
@treydock
Copy link
Contributor Author

/cherry-pick release-1.10

@treydock
Copy link
Contributor Author

/cherry-pick release-1.11

@codecov Codecov
Copy link

codecov bot commented Nov 15, 2023 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (bed4632) 33.56% compared to head (72e258e) 33.56%.

Additional details and impacted files 
@@           Coverage Diff           @@
##             main    #8913   +/-   ##
=======================================
  Coverage   33.56%   33.56%           
=======================================
  Files         315      315           
  Lines       24905    24905           
=======================================
  Hits         8359     8359           
  Misses      15754    15754           
  Partials      792      792

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

@realshuting
Copy link
Member

Thanks @treydock ! Do we need to instruct users how to cope with this change?

@treydock
Copy link
Contributor Author

Thanks @treydock ! Do we need to instruct users how to cope with this change?

I don't think so mostly because the behavior for what someone puts into their values.yaml or passing to helm install is still the same, ie they have to explicitly enable these resources. What might have happened before is someone enabled the resources but the resources CRD wasn't available yet so then things just silently didn't get added. Not sure if this maybe warrants a warning that the ServiceMonitor resources must exist before Kyverno chart is applied?

@realshuting
Copy link
Member

Not sure if this maybe warrants a warning that the ServiceMonitor resources must exist before Kyverno chart is applied?

Fine for me unless others have an opinion.

@treydock treydock enabled auto-merge (squash) November 16, 2023 15:26
@treydock treydock merged commit 830e429 into kyverno:main Nov 16, 2023
@gcp-cherry-pick-bot GCP Cherry-Pick Bot
Copy link

Cherry-pick failed with Merge error 830e4290ff52bc3db694506006a7a321e2beca7a into temp-cherry-pick-8729c2-release-1.10

gcp-cherry-pick-bot bot pushed a commit that referenced this pull request Nov 16, 2023
@treydock @realshuting
Revert "fix(chart): only create ServiceMonitor if cluster supports it (…
129cf44 
…#7926)" (#8913)

This reverts commit 590dce5.

This will ensure servicemonitor can be enabled with ArgoCD which doesn't support querying API capabilities

Fixes #8891

Signed-off-by: Trey Dockendorf <tdockendorf@osc.edu>
Co-authored-by: shuting <shuting@nirmata.com>
@gcp-cherry-pick-bot gcp-cherry-pick-bot bot mentioned this pull request Nov 16, 2023
Merged
@treydock treydock deleted the revert-7926 branch November 16, 2023 15:43
treydock added a commit that referenced this pull request Nov 16, 2023
@gcp-cherry-pick-bot @treydock @realshuting
Revert "fix(chart): only create ServiceMonitor if cluster supports it (…
3093210 
…#7926)" (#8913) (#8931)

This reverts commit 590dce5.

This will ensure servicemonitor can be enabled with ArgoCD which doesn't support querying API capabilities

Fixes #8891

Signed-off-by: Trey Dockendorf <tdockendorf@osc.edu>
Co-authored-by: treydock <tdockendorf@osc.edu>
Co-authored-by: shuting <shuting@nirmata.com>
vishal-chdhry pushed a commit to vishal-chdhry/kyverno that referenced this pull request Jan 5, 2024
@treydock @realshuting @vishal-chdhry
Revert "fix(chart): only create ServiceMonitor if cluster supports it (…
52ed957 
…kyverno#7926)" (kyverno#8913)

This reverts commit 590dce5.

This will ensure servicemonitor can be enabled with ArgoCD which doesn't support querying API capabilities

Fixes kyverno#8891

Signed-off-by: Trey Dockendorf <tdockendorf@osc.edu>
Co-authored-by: shuting <shuting@nirmata.com>
vishal-chdhry pushed a commit to vishal-chdhry/kyverno that referenced this pull request Jan 5, 2024
@treydock @realshuting @vishal-chdhry
Revert "fix(chart): only create ServiceMonitor if cluster supports it (…
0827f64 
…kyverno#7926)" (kyverno#8913)

This reverts commit 590dce5.

This will ensure servicemonitor can be enabled with ArgoCD which doesn't support querying API capabilities

Fixes kyverno#8891

Signed-off-by: Trey Dockendorf <tdockendorf@osc.edu>
Co-authored-by: shuting <shuting@nirmata.com>
vishal-chdhry pushed a commit to vishal-chdhry/kyverno that referenced this pull request Jan 6, 2024
@treydock @realshuting @vishal-chdhry
Revert "fix(chart): only create ServiceMonitor if cluster supports it (…
1055c0f 
…kyverno#7926)" (kyverno#8913)

This reverts commit 590dce5.

This will ensure servicemonitor can be enabled with ArgoCD which doesn't support querying API capabilities

Fixes kyverno#8891

Signed-off-by: Trey Dockendorf <tdockendorf@osc.edu>
Co-authored-by: shuting <shuting@nirmata.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@realshuting realshuting realshuting approved these changes

@eddycharly eddycharly Awaiting requested review from eddycharly eddycharly is a code owner

@JimBugwadia JimBugwadia Awaiting requested review from JimBugwadia

+1 more reviewer

@chipzoller chipzoller chipzoller approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
cherry-pick-required milestone 1.12.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Bug] Servicemonitor cannot be created through ArgoCD when using the helm-chart
3 participants
@treydock @realshuting @chipzoller