From 44bb015c2e6df7947c27f6cecf31c47a1f3a91dc Mon Sep 17 00:00:00 2001 From: "Jonas Brand (8R0WNI3)" Date: Wed, 1 Apr 2026 08:14:58 +0200 Subject: [PATCH] Remove Ingress/Nginx leftovers After having migrated to the Kubernetes Gateway API (see https://github.com/open-component-model/prometheus/pull/18), those resources are not required anymore. Signed-off-by: Jonas Brand (8R0WNI3) --- .../templates/ingress.yaml | 32 ------------------- .../templates/servicemonitors.yaml | 15 --------- extension-definitions.yaml | 21 ------------ 3 files changed, 68 deletions(-) delete mode 100644 charts/prometheus-operator/templates/ingress.yaml diff --git a/charts/prometheus-operator/templates/ingress.yaml b/charts/prometheus-operator/templates/ingress.yaml deleted file mode 100644 index 848a1d8..0000000 --- a/charts/prometheus-operator/templates/ingress.yaml +++ /dev/null @@ -1,32 +0,0 @@ -{{- if default dict .Values.ingress }} -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: prometheus - namespace: {{ .Values.target_namespace | default .Release.Namespace }} - annotations: - {{- range $annotation, $value := default dict .Values.ingress.annotations }} - {{ $annotation }}: {{ $value }} - {{- end }} -spec: - ingressClassName: {{ default "nginx" .Values.ingress.class }} - rules: - {{- range $host := .Values.ingress.hosts }} - - host: {{ $host }} - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: prometheus-operated - port: - number: 9090 - {{- end }} - tls: - - hosts: - {{- range $host := .Values.ingress.hosts }} - - "{{ $host }}" - {{- end }} - secretName: prometheus-tls -{{- end }} diff --git a/charts/prometheus-operator/templates/servicemonitors.yaml b/charts/prometheus-operator/templates/servicemonitors.yaml index c48efe1..6ab5431 100644 --- a/charts/prometheus-operator/templates/servicemonitors.yaml +++ b/charts/prometheus-operator/templates/servicemonitors.yaml @@ -15,21 +15,6 @@ spec: --- apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor -metadata: - name: nginx-ingress-controller - namespace: {{ .Values.target_namespace | default .Release.Namespace }} - labels: - app: prometheus -spec: - selector: - matchLabels: - app.kubernetes.io/name: nginx-ingress-controller - endpoints: - - port: metrics - interval: 15s ---- -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor metadata: name: envoy-gateway namespace: {{ .Values.target_namespace | default .Release.Namespace }} diff --git a/extension-definitions.yaml b/extension-definitions.yaml index ceec0f3..782f561 100644 --- a/extension-definitions.yaml +++ b/extension-definitions.yaml @@ -16,27 +16,6 @@ installation: helm_attribute: host value: prometheus.${base_url} value_type: python-string-template - - helm_chart_name: prometheus-operator - helm_attribute: ingress.annotations."cert.gardener.cloud/purpose" - value: managed - value_type: literal - - helm_chart_name: prometheus-operator - helm_attribute: ingress.annotations."dns.gardener.cloud/class" - value: garden - value_type: literal - - helm_chart_name: prometheus-operator - helm_attribute: ingress.annotations."dns.gardener.cloud/dnsnames" - value: '"*"' - value_type: literal - - helm_chart_name: prometheus-operator - helm_attribute: ingress.hosts - value: - - prometheus.${base_url} - value_type: python-string-template - - helm_chart_name: prometheus-operator - helm_attribute: ingress.class - value: nginx-${target_namespace} - value_type: python-string-template - helm_chart_name: prometheus-operator helm_attribute: rbac.annotations."resources.gardener.cloud/keep-object" value: '"${keep_clusterwide_objects}"'