Merge pull request #781 from philschleier/master

Revert kubeadm selector and replace nodePort

jsonnet/kube-prometheus/kube-prometheus-kubeadm.libsonnet

@@ -19,14 +19,14 @@ local service(name, namespace, labels, selector, ports) = {
       'kube-controller-manager-prometheus-discovery',
       'kube-system',
       { 'k8s-app': 'kube-controller-manager' },
-      { 'k8s-app': 'kube-controller-manager' },
+      { 'component': 'kube-controller-manager' },
       [{ name: 'https-metrics', port: 10257, targetPort: 10257 }]
     ),
     kubeSchedulerPrometheusDiscoveryService: service(
       'kube-scheduler-prometheus-discovery',
       'kube-system',
       { 'k8s-app': 'kube-scheduler' },
-      { 'k8s-app': 'kube-scheduler' },
+      { 'component': 'kube-scheduler' },
       [{ name: 'https-metrics', port: 10259, targetPort: 10259 }],
     ),
   },

jsonnet/kube-prometheus/kube-prometheus-node-ports.libsonnet

@@ -1,6 +1,6 @@
 local patch(ports) = {
   spec+: {
-    ports+: ports,
+    ports: ports,
     type: 'NodePort',
   },
 };