chore(helm): Remove externalLabels that does not exists

qonto · Oct 31, 2023 · 150fb42 · 150fb42
1 parent 46fa6a8
commit 150fb42
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 12 deletions.
diff --git a/configs/helm/templates/servicemonitor.yaml b/configs/helm/templates/servicemonitor.yaml
@@ -19,12 +19,6 @@ spec:
       {{- if .Values.serviceMonitor.scrapeTimeout }}
       scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
       {{- end }}
-      {{- if .Values.serviceMonitor.externalLabels }}
-      externalLabels:
-        {{- with .Values.serviceMonitor.externalLabels }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-      {{- end }}
       {{- if .Values.serviceMonitor.relabelings }}
       relabelings:
         {{- toYaml .Values.serviceMonitor.relabelings | nindent 10 }}

diff --git a/configs/helm/tests/servicemonitor_test.yaml b/configs/helm/tests/servicemonitor_test.yaml
@@ -39,9 +39,6 @@ tests:
       - equal:
           path: metadata.labels.additionalLabel1
           value: value1
-      - equal:
-          path: spec.endpoints[0].externalLabels.externalLabel1
-          value: externalValue1
       - equal:
           path: spec.endpoints[0].relabelings[0].targetLabel
           value: team

diff --git a/configs/helm/tests/values/with_servicemonitor.yaml b/configs/helm/tests/values/with_servicemonitor.yaml
@@ -4,8 +4,6 @@ serviceMonitor:
   scrapeTimeout: 60s
   additionalLabels:
     additionalLabel1: value1
-  externalLabels:
-    externalLabel1: externalValue1
   sampleLimit: 42
   relabelings:
     - sourceLabels:

diff --git a/configs/helm/values.yaml b/configs/helm/values.yaml
@@ -70,7 +70,6 @@ serviceMonitor:
   interval: 60s
   #scrapeTimeout: 30s
   additionalLabels: {} # The labels to add on ServiceMonitor CRD
-  externalLabels: {} # The labels to add to any time series or alerts when communicating with external systems (federation, remote storage, Alertmanager)
   relabelings: [] # RelabelConfigs to apply to samples before scraping
   metricRelabelings: [] # MetricRelabelConfigs to apply to samples before ingestion
   sampleLimit: 0 # SampleLimit defines per-scrape limit on number of scraped samples that will be accepted.