From 63a5e3895c7dddfca3e9c8eee2ffc8e7c451481d Mon Sep 17 00:00:00 2001
From: Vishnu Kannan <vishnuk@google.com>
Date: Mon, 18 May 2015 12:04:46 -0700
Subject: [PATCH] Updating heapster to v0.12.1. This adds support for tokens
 and improves scalability in large clusters.

---
 .../google/heapster-controller.yaml           | 19 +++++++++++++++----
 .../influxdb/grafana-service.yaml             |  1 -
 .../influxdb/heapster-controller.yaml         | 16 +++++++++++-----
 .../influxdb/influxdb-service.yaml            |  2 --
 4 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
index 158c354a55c..6bf50c2e56e 100644
--- a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
@@ -16,17 +16,28 @@ spec:
         kubernetes.io/cluster-service: "true"
     spec: 
       containers: 
-        - image: gcr.io/google_containers/heapster:v0.11.0
+        - image: gcr.io/google_containers/heapster:v0.12.1
           name: heapster
-          env: 
-            - name: FLAGS
-              value: "--poll_duration=2m --stats_resolution=1m --sink=gcm --sink=gcl"
+          command:
+            - /heapster
+            - --source=kubernetes:https://kubernetes
+            - --sink=gcm
+            - --sink=gcl
+            - --poll_duration=2m
+            - --stats_resolution=1m
           volumeMounts: 
             - name: ssl-certs
               mountPath: /etc/ssl/certs
               readOnly: true
+            - name: monitoring-token
+              mountPath: /etc/kubernetes/kubeconfig
+              readOnly: true
+
       volumes: 
         - name: ssl-certs
           hostPath: 
             path: /etc/ssl/certs
+        - name: monitoring-token
+          secret:
+            secretName: token-system-monitoring
 
diff --git a/cluster/addons/cluster-monitoring/influxdb/grafana-service.yaml b/cluster/addons/cluster-monitoring/influxdb/grafana-service.yaml
index 03691121488..d85dbaaf624 100644
--- a/cluster/addons/cluster-monitoring/influxdb/grafana-service.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb/grafana-service.yaml
@@ -2,7 +2,6 @@ apiVersion: v1beta3
 kind: Service
 metadata: 
   labels: 
-    name: influxGrafana
     kubernetes.io/cluster-service: "true"
     kubernetes.io/name: "Grafana"
   name: monitoring-grafana
diff --git a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
index cecbb239bd6..dab1fe1b898 100644
--- a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
@@ -16,17 +16,23 @@ spec:
         kubernetes.io/cluster-service: "true"
     spec: 
       containers: 
-        - image: gcr.io/google_containers/heapster:v0.11.0
+        - image: gcr.io/google_containers/heapster:v0.12.1
           name: heapster
-          env: 
-            - name: FLAGS
-              value: "--poll_duration=2m --stats_resolution=1m --sink influxdb:http://monitoring-influxdb.default:8086"
+          command:
+            - /heapster
+            - --source=kubernetes:https://kubernetes
+            - --sink=influxdb:http://monitoring-influxdb:8086
           volumeMounts: 
             - name: ssl-certs
               mountPath: /etc/ssl/certs
               readOnly: true
+            - name: monitoring-token
+              mountPath: /etc/kubernetes/kubeconfig
+              readOnly: true
       volumes: 
         - name: ssl-certs
           hostPath: 
             path: "/etc/ssl/certs"
-
+        - name: monitoring-token
+          secret:
+            secretName: token-system-monitoring
diff --git a/cluster/addons/cluster-monitoring/influxdb/influxdb-service.yaml b/cluster/addons/cluster-monitoring/influxdb/influxdb-service.yaml
index eb39a3a1902..fa7d26ec365 100644
--- a/cluster/addons/cluster-monitoring/influxdb/influxdb-service.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb/influxdb-service.yaml
@@ -3,8 +3,6 @@ kind: Service
 metadata: 
   labels: 
     name: influxGrafana
-    kubernetes.io/cluster-service: "true"
-    kubernetes.io/name: "InfluxDB"
   name: monitoring-influxdb
 spec: 
   ports: