Merge pull request #1420 from raptorsun/feature/selectorUpdate

Author: paulfantom

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',

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',
     },
   },

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

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