diff --git a/jsonnet/kube-prometheus/components/alertmanager.libsonnet b/jsonnet/kube-prometheus/components/alertmanager.libsonnet index 910ff7b91f76e913f5cf8e6b620f31c58d3de33b..fa6368ca6b56433eb57f0323b9f2ed145eb0d4d9 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 6ee18196c7e5d49e2532aa71712edcd7d46ff084..5c6e04ce574d988a79f1b3eb7f480912200b3283 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 473e050c950d23bedbd22185a4287eb8836edfd0..f6a13070e54309cffbb5809c5d7e8fe198f18551 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 189fda416bf76b37bd2734c96f32678e6fadcc01..25de9f7a7904d2739ce8fe91bc958f37e320820d 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