Fix pod annotations for prometheus #1
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…service object Signed-off-by: Mike Robinson <mrobinson@wrapbook.com>
gete76
reviewed
Apr 22, 2025
| azure.workload.identity/use: "true" | ||
| {{- end }} | ||
| {{- if or .Values.podAnnotations.keda .Values.additionalAnnotations }} | ||
| {{- if or .Values.podAnnotations.keda .Values.additionalAnnotations (and .Values.prometheus.operator.enabled ( not (or .Values.prometheus.operator.podMonitor.enabled .Values.prometheus.operator.serviceMonitor.enabled )) ) }} |
There was a problem hiding this comment.
Not sure this is gonna work. I think you have to wrap the or statement in the and statement.
There was a problem hiding this comment.
nvm, looks like you copied that from a working code below.
gete76
approved these changes
Apr 22, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Prometheus self-discovery expects annotations on pods where a
/metricsendpoint is to be scraped. The metrics-server template included a conditional for this, but such was missing from operator (manager) and webhooks.These same annotations were being applied to the metrics-server service template, which is redundant (and possibly unused by modern Prometheus) when use of ServiceMonitor is available.
Checklist
Fixes #