From bdf563be4b80aeee19b0088112cfe90d221459ee Mon Sep 17 00:00:00 2001
From: Marcin Wielgus <mwielgus@google.com>
Date: Mon, 1 Feb 2016 12:22:11 +0100
Subject: [PATCH] Use Heapster v0.20.0-alpha3

---
 .../cluster-monitoring/google/heapster-controller.yaml       | 5 +++--
 .../googleinfluxdb/heapster-controller-combined.yaml         | 5 +++--
 .../cluster-monitoring/influxdb/heapster-controller.yaml     | 5 +++--
 .../cluster-monitoring/standalone/heapster-controller.yaml   | 3 ++-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
index 562459b41a9..b6f0c59c9a1 100644
--- a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
@@ -26,7 +26,7 @@ spec:
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v0.20.0-alpha2
+        - image: gcr.io/google_containers/heapster:v0.20.0-alpha3
           name: heapster
           resources:
             # keep request = limit to keep this container in guaranteed class
@@ -40,11 +40,12 @@ spec:
             - /heapster
             - --source=kubernetes:''
             - --sink=gcm
+            - --metric_resolution=60s
           volumeMounts:
             - name: ssl-certs
               mountPath: /etc/ssl/certs
               readOnly: true
-        - image: gcr.io/google_containers/heapster:v0.20.0-alpha2
+        - image: gcr.io/google_containers/heapster:v0.20.0-alpha3
           name: eventer
           resources:
             # keep request = limit to keep this container in guaranteed class
diff --git a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
index 9581723b3bd..19e0b6ab004 100644
--- a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
+++ b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
@@ -26,7 +26,7 @@ spec:
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v0.20.0-alpha2
+        - image: gcr.io/google_containers/heapster:v0.20.0-alpha3
           name: heapster
           resources:
             # keep request = limit to keep this container in guaranteed class
@@ -40,11 +40,12 @@ spec:
             - /heapster
             - --source=kubernetes:''
             - --sink=influxdb:http://monitoring-influxdb:8086
+            - --metric_resolution=60s
           volumeMounts:
             - name: ssl-certs
               mountPath: /etc/ssl/certs
               readOnly: true
-        - image: gcr.io/google_containers/heapster:v0.20.0-alpha2
+        - image: gcr.io/google_containers/heapster:v0.20.0-alpha3
           name: eventer
           resources:
             # keep request = limit to keep this container in guaranteed class
diff --git a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
index bf9d4c4b44c..81eed971baf 100644
--- a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
@@ -26,7 +26,7 @@ spec:
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v0.20.0-alpha2
+        - image: gcr.io/google_containers/heapster:v0.20.0-alpha3
           name: heapster
           resources:
             # keep request = limit to keep this container in guaranteed class
@@ -40,7 +40,8 @@ spec:
             - /heapster
             - --source=kubernetes:''
             - --sink=influxdb:http://monitoring-influxdb:8086
-        - image: gcr.io/google_containers/heapster:v0.20.0-alpha2
+            - --metric_resolution=60s
+        - image: gcr.io/google_containers/heapster:v0.20.0-alpha3
           name: eventer
           resources:
             # keep request = limit to keep this container in guaranteed class
diff --git a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
index 43b637ede5a..c699a1749f3 100644
--- a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
@@ -26,7 +26,7 @@ spec:
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v0.20.0-alpha2
+        - image: gcr.io/google_containers/heapster:v0.20.0-alpha3
           name: heapster
           resources:
             # keep request = limit to keep this container in guaranteed class
@@ -39,3 +39,4 @@ spec:
           command:
             - /heapster
             - --source=kubernetes:''
+            - --metric_resolution=60s