diff --git a/charts/greenhouse/Chart.yaml b/charts/greenhouse/Chart.yaml index e6c1dffb3..187f7cafe 100644 --- a/charts/greenhouse/Chart.yaml +++ b/charts/greenhouse/Chart.yaml @@ -5,7 +5,7 @@ apiVersion: v2 name: greenhouse description: A Helm chart for deploying greenhouse type: application -version: 0.4.4 +version: 0.4.5 appVersion: "0.1.0" dependencies: diff --git a/charts/idproxy/templates/servicemonitor.yaml b/charts/idproxy/templates/servicemonitor.yaml deleted file mode 100644 index fd1422bf1..000000000 --- a/charts/idproxy/templates/servicemonitor.yaml +++ /dev/null @@ -1,21 +0,0 @@ -{{- if .Capabilities.APIVersions.Has "monitoring.coreos.com/v1/ServiceMonitor" }} -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: {{ include "idproxy.fullname" . }} - labels: - plugin: kube-monitoring -spec: - endpoints: - - honorLabels: true - interval: 30s - port: metrics - scheme: http - path: /metrics - namespaceSelector: - matchNames: - - {{ .Release.Namespace }} - selector: - matchLabels: - {{- include "idproxy.selectorLabels" . | nindent 6 }} -{{- end -}} diff --git a/charts/manager/templates/servicemonitor.yaml b/charts/manager/templates/servicemonitor.yaml deleted file mode 100644 index 8d289c3b7..000000000 --- a/charts/manager/templates/servicemonitor.yaml +++ /dev/null @@ -1,49 +0,0 @@ -{{/* -SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Greenhouse contributors -SPDX-License-Identifier: Apache-2.0 -*/}} - -{{- if .Capabilities.APIVersions.Has "monitoring.coreos.com/v1/ServiceMonitor" }} -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: {{ include "manager.fullname" . }}-controller-manager - labels: - plugin: kube-monitoring -spec: - endpoints: - - honorLabels: true - interval: 30s - port: metrics - scheme: http - path: /metrics - namespaceSelector: - matchNames: - - {{ .Release.Namespace }} - selector: - matchLabels: - app: greenhouse - {{- include "manager.selectorLabels" . | nindent 6 }} - ---- - -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: greenhouse-service-proxies - labels: - plugin: kube-monitoring -spec: - endpoints: - - honorLabels: true - interval: 30s - port: metrics - scheme: http - path: /metrics - namespaceSelector: - any: true - selector: - matchLabels: - app.kubernetes.io/instance: service-proxy - app.kubernetes.io/name: service-proxy -{{ end }}