Merge pull request #9901 from vishh/svc_name

cluster/addons/cluster-monitoring/google/heapster-service.yaml

@@ -4,7 +4,7 @@ metadata:
   name: monitoring-heapster
   labels: 
     kubernetes.io/cluster-service: "true"
-    name: monitoring-heapster
+    kubernetes.io/name: "Heapster"
 spec: 
   ports: 
     - port: 80

cluster/addons/cluster-monitoring/influxdb/heapster-service.yaml

@@ -4,7 +4,7 @@ metadata:
   name: monitoring-heapster
   labels: 
     kubernetes.io/cluster-service: "true"
-    name: monitoring-heapster
+    kubernetes.io/name: "Heapster"
 spec: 
   ports: 
     - port: 80

cluster/addons/cluster-monitoring/influxdb/influxdb-service.yaml

@@ -4,9 +4,8 @@ metadata:
   name: monitoring-influxdb
   namespace: default 
   labels: 
-    k8s-app: influxGrafana
     kubernetes.io/cluster-service: "true"
-    kubernetes.io/name: "influxGrafana"
+    kubernetes.io/name: "InfluxDB"
 spec: 
   ports: 
     - name: http

cluster/addons/cluster-monitoring/standalone/heapster-service.yaml

@@ -4,7 +4,7 @@ metadata:
   name: monitoring-heapster
   labels: 
     kubernetes.io/cluster-service: "true"
-    name: monitoring-heapster
+    kubernetes.io/name: "Heapster"
 spec: 
   ports: 
     - port: 80