Remove duplicate relabings and metricRelabelings#1830
Conversation
GuillaumeSmaha
requested review from
fedepaol,
gclawes,
oribon,
rata and
russellb
as code owners
| selector: | ||
| matchLabels: | ||
| name: {{ template "metallb.fullname" . }}-speaker-monitor-service | ||
| {{- if .Values.prometheus.serviceMonitor.metricRelabelings }} |
There was a problem hiding this comment.
Yes, metricRelabelings and relabelings are ServiceMonitor .spec.endpoints property and not .spec fields itself.
| matchLabels: | ||
| name: {{ template "metallb.fullname" . }}-speaker-monitor-service | ||
| {{- if .Values.prometheus.serviceMonitor.metricRelabelings }} | ||
| metricRelabelings: |
There was a problem hiding this comment.
can you also do same for https://github.com/metallb/metallb/pull/1830/files#diff-f25ac06488a7f1e7ec78f4071e9ad0efada29c94e5cc37d572cc35ff2754ca02L134-L141 ?
It has to be moved under endpoints.
There was a problem hiding this comment.
This is not yet moved under endpoints as similar to speaker-monitor.
There was a problem hiding this comment.
Ohh ok sorry, I didn't understand you wanted to move it 🤦
There was a problem hiding this comment.
no problem, it looks fine now. just noticed you've 3 commits for same kind of changes, can you just do it with a single commit ?
|
It is done |
GuillaumeSmaha
force-pushed
the
patch-1
branch
from
356eaf6 to
e9262b8
Compare
|
LGTM |
|
@GuillaumeSmaha thanks for the PR! Mind fixing the commit message according to the ci failure? |
|
I think what's missing is just an empty line after the subj |
Move metricRelabelings & relabelings for controller-monitor Error when trying to use `relabelings` on ServiceMonitor: ``` Error: unable to build kubernetes objects from release manifest: error validating \"\": error validating data: ValidationError(ServiceMonitor.spec): unknown field \"relabelings\" in com.coreos.monitoring.v1.ServiceMonitor.spec ``` On https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.63.0/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml, `relabings` and `metricRelabelings` are only defined at one place. Remove other part with relabings and metricRelabelings
3 participants
When I am trying to use
relabelingson ServiceMonitor, I get:On https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.63.0/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml,
relabingsandmetricRelabelingsare only defined at one place.And there are already used on line 21