Merge pull request #858 from brancz/fix-kubelet-label

kubelet: Revert label selector

jsonnet/kube-prometheus/prometheus/prometheus.libsonnet

@@ -309,7 +309,7 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
         labels: { 'app.kubernetes.io/name': 'kubelet' },
       },
       spec: {
-        jobLabel: 'app.kubernetes.io/name',
+        jobLabel: 'k8s-app',
         endpoints: [
           {
             port: 'https-metrics',
@@ -364,7 +364,7 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
           },
         ],
         selector: {
-          matchLabels: { 'app.kubernetes.io/name': 'kubelet' },
+          matchLabels: { 'k8s-app': 'kubelet' },
         },
         namespaceSelector: {
           matchNames: ['kube-system'],

manifests/prometheus-serviceMonitorKubelet.yaml

@@ -81,10 +81,10 @@ spec:
     scheme: https
     tlsConfig:
       insecureSkipVerify: true
-  jobLabel: app.kubernetes.io/name
+  jobLabel: k8s-app
   namespaceSelector:
     matchNames:
     - kube-system
   selector:
     matchLabels:
-      app.kubernetes.io/name: kubelet
+      k8s-app: kubelet