From c70014d399efa35a318fda80f3ce1b9952e8ab8d Mon Sep 17 00:00:00 2001
From: Vishnu Kannan <vishnuk@google.com>
Date: Tue, 16 Jun 2015 14:46:50 -0700
Subject: [PATCH] Updating heapster service labels to make it compatible with
 `kubectl cluster-info`

---
 cluster/addons/cluster-monitoring/google/heapster-service.yaml | 2 +-
 .../addons/cluster-monitoring/influxdb/heapster-service.yaml   | 2 +-
 .../addons/cluster-monitoring/influxdb/influxdb-service.yaml   | 3 +--
 .../addons/cluster-monitoring/standalone/heapster-service.yaml | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/cluster/addons/cluster-monitoring/google/heapster-service.yaml b/cluster/addons/cluster-monitoring/google/heapster-service.yaml
index 8ed8ff9a65f..101ec6fe61b 100644
--- a/cluster/addons/cluster-monitoring/google/heapster-service.yaml
+++ b/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
diff --git a/cluster/addons/cluster-monitoring/influxdb/heapster-service.yaml b/cluster/addons/cluster-monitoring/influxdb/heapster-service.yaml
index 8ed8ff9a65f..101ec6fe61b 100644
--- a/cluster/addons/cluster-monitoring/influxdb/heapster-service.yaml
+++ b/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
diff --git a/cluster/addons/cluster-monitoring/influxdb/influxdb-service.yaml b/cluster/addons/cluster-monitoring/influxdb/influxdb-service.yaml
index b115086a2e4..e608e3161cf 100644
--- a/cluster/addons/cluster-monitoring/influxdb/influxdb-service.yaml
+++ b/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
diff --git a/cluster/addons/cluster-monitoring/standalone/heapster-service.yaml b/cluster/addons/cluster-monitoring/standalone/heapster-service.yaml
index 8ed8ff9a65f..101ec6fe61b 100644
--- a/cluster/addons/cluster-monitoring/standalone/heapster-service.yaml
+++ b/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