chore(kube-monitoring) remove defaultRelabelConfig

kube-monitoring/charts/Chart.yaml

@@ -9,7 +9,7 @@ maintainers:
 name: kube-monitoring
 sources:
   - https://github.com/cloudoperators/greenhouse-extensions
-version: 8.0.1
+version: 8.0.2
 keywords:
   - operator
   - prometheus
@@ -26,4 +26,4 @@ dependencies:
     alias: blackboxExporter
     repository: https://prometheus-community.github.io/helm-charts
     version: 11.2.2
-    condition: blackboxExporter.enabled
+    condition: blackboxExporter.enabled

kube-monitoring/charts/templates/_helper.tpl

@@ -129,13 +129,3 @@ release: {{ .Release.Name }}
 {{- end }}
 {{- end }}
 {{- end }}
-
-{{- define "kubeMonitoring.defaultRelabelConfig" -}}
-{{- if .Values.kubeMonitoring.prometheus.prometheusSpec.externalLabels }}
-{{- range $key, $value := .Values.kubeMonitoring.prometheus.prometheusSpec.externalLabels }}
-- action: replace
-  target_label: {{ $key }}
-  replacement: "{{ tpl $value $ }}"
-{{- end }}
-{{- end }}
-{{- end }}

kube-monitoring/charts/templates/alertmanager-config.yaml

@@ -7,5 +7,4 @@ metadata:
 {{- include "kube-prometheus-stack.labels" . | indent 4 }}
 
 data:
-  config.yaml: {{ tpl (include (print $.Template.BasePath "/_alertmanager-config.yaml.tpl") .) . | b64enc }}
-  relabelConfig.yaml: {{ include "kubeMonitoring.defaultRelabelConfig" . | b64enc }}
+  config.yaml: {{ tpl (include (print $.Template.BasePath "/_alertmanager-config.yaml.tpl") .) . | b64enc }}

kube-monitoring/charts/templates/podmonitor-sd.yaml

@@ -31,7 +31,6 @@ spec:
         {{- if $values.additionalRelabelings }}
         {{- tpl (toYaml $values.additionalRelabelings) . | nindent 8 }}
         {{- end }}
-        {{- include "kubeMonitoring.defaultRelabelConfig" . | replace "target_label" "targetLabel" | nindent 8 }}
       {{- if $values.additionalMetricRelabelings }}
       metricRelabelings:
         {{- tpl (toYaml $values.additionalMetricRelabelings) . | nindent 8 }}

kube-monitoring/plugindefinition.yaml

@@ -6,7 +6,7 @@ kind: PluginDefinition
 metadata:
   name: kube-monitoring
 spec:
-  version: 9.0.1
+  version: 9.0.2
   displayName: Kubernetes monitoring
   description: Native deployment and management of Prometheus along with Kubernetes cluster monitoring components.
   docMarkDownUrl: https://raw.githubusercontent.com/cloudoperators/greenhouse-extensions/main/kube-monitoring/README.md
@@ -15,7 +15,7 @@ spec:
     # renovate depName=ghcr.io/cloudoperators/greenhouse-extensions/charts/kube-monitoring
     name: kube-monitoring
     repository: oci://ghcr.io/cloudoperators/greenhouse-extensions/charts
-    version: 8.0.1
+    version: 8.0.2
   options:
     - name: global.commonLabels
       description: Labels to add to all resources. This can be used to add a support group or service to all alerts.
@@ -136,13 +136,6 @@ spec:
           plugin: "{{ $.Release.Name }}"
       required: false
       type: map
-    - name: kubeMonitoring.prometheus.prometheusSpec.additionalAlertRelabelConfigsSecret
-      description: PrometheusRules to be selected for target discovery.
-      default:
-        name: "{{ $.Release.Name }}-alertmanager-config"
-        key: relabelConfig.yaml
-      required: false
-      type: map
     - name: kubeMonitoring.prometheus.prometheusSpec.additionalAlertManagerConfigsSecret
       description: PrometheusRules to be selected for target discovery.
       default: