From b6c97fc6c03dea43f888f403566ae04ecde9e9a5 Mon Sep 17 00:00:00 2001
From: Haoyu Sun <hasun@redhat.com>
Date: Tue, 5 Oct 2021 19:59:39 +0200
Subject: [PATCH] remove "app" label selector deprecated by prometheus-operator
---
jsonnet/kube-prometheus/components/alertmanager.libsonnet | 1 -
jsonnet/kube-prometheus/components/prometheus.libsonnet | 2 +-
manifests/alertmanager-service.yaml | 1 -
manifests/prometheus-service.yaml | 1 -
4 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/jsonnet/kube-prometheus/components/alertmanager.libsonnet b/jsonnet/kube-prometheus/components/alertmanager.libsonnet
index 910ff7b9..fa6368ca 100644
--- a/jsonnet/kube-prometheus/components/alertmanager.libsonnet
+++ b/jsonnet/kube-prometheus/components/alertmanager.libsonnet
@@ -140,7 +140,6 @@ function(params) {
{ name: 'reloader-web', port: am._config.reloaderPort, targetPort: 'reloader-web' },
],
selector: {
- app: 'alertmanager',
alertmanager: am._config.name,
} + am._config.selectorLabels,
sessionAffinity: 'ClientIP',
diff --git a/jsonnet/kube-prometheus/components/prometheus.libsonnet b/jsonnet/kube-prometheus/components/prometheus.libsonnet
index 6ee18196..5c6e04ce 100644
--- a/jsonnet/kube-prometheus/components/prometheus.libsonnet
+++ b/jsonnet/kube-prometheus/components/prometheus.libsonnet
@@ -107,7 +107,7 @@ function(params) {
[{ name: 'grpc', port: 10901, targetPort: 10901 }]
else []
),
- selector: { app: 'prometheus' } + p._config.selectorLabels,
+ selector: p._config.selectorLabels,
sessionAffinity: 'ClientIP',
},
},
diff --git a/manifests/alertmanager-service.yaml b/manifests/alertmanager-service.yaml
index 473e050c..f6a13070 100644
--- a/manifests/alertmanager-service.yaml
+++ b/manifests/alertmanager-service.yaml
@@ -19,7 +19,6 @@ spec:
targetPort: reloader-web
selector:
alertmanager: main
- app: alertmanager
app.kubernetes.io/component: alert-router
app.kubernetes.io/name: alertmanager
app.kubernetes.io/part-of: kube-prometheus
diff --git a/manifests/prometheus-service.yaml b/manifests/prometheus-service.yaml
index 189fda41..25de9f7a 100644
--- a/manifests/prometheus-service.yaml
+++ b/manifests/prometheus-service.yaml
@@ -18,7 +18,6 @@ spec:
port: 8080
targetPort: reloader-web
selector:
- app: prometheus
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
--
GitLab