From f93b1f104307bfb1a5ce3b0723aa402b11b8bae7 Mon Sep 17 00:00:00 2001
From: Piotr Szczesniak <pszczesniak@google.com>
Date: Mon, 25 Jan 2016 21:55:16 +0100
Subject: [PATCH] Bumped Heapster to v0.18.5 to fix issue with nil pointer
 panic

---
 .../cluster-monitoring/google/heapster-controller.yaml | 10 +++++-----
 .../googleinfluxdb/heapster-controller-combined.yaml   | 10 +++++-----
 .../influxdb/heapster-controller.yaml                  | 10 +++++-----
 .../standalone/heapster-controller.yaml                | 10 +++++-----
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
index 4600cd6195..215d805cce 100644
--- a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
@@ -7,26 +7,26 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: heapster-v11
+  name: heapster-v12
   namespace: kube-system
   labels:
     k8s-app: heapster
-    version: v11
+    version: v12
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     k8s-app: heapster
-    version: v11
+    version: v12
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v11
+        version: v12
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v0.18.4
+        - image: gcr.io/google_containers/heapster:v0.18.5
           name: heapster
           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 4b62ee9d67..b6e31c405d 100644
--- a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
+++ b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
@@ -7,26 +7,26 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: heapster-v11
+  name: heapster-v12
   namespace: kube-system
   labels:
     k8s-app: heapster
-    version: v11
+    version: v12
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     k8s-app: heapster
-    version: v11
+    version: v12
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v11
+        version: v12
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v0.18.4
+        - image: gcr.io/google_containers/heapster:v0.18.5
           name: heapster
           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 2e133caf50..ee84caff14 100644
--- a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
@@ -7,26 +7,26 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: heapster-v11
+  name: heapster-v12
   namespace: kube-system
   labels:
     k8s-app: heapster
-    version: v11
+    version: v12
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     k8s-app: heapster
-    version: v11
+    version: v12
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v11
+        version: v12
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v0.18.4
+        - image: gcr.io/google_containers/heapster:v0.18.5
           name: heapster
           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 44de70bbfc..2d49587c15 100644
--- a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
@@ -7,26 +7,26 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: heapster-v11
+  name: heapster-v12
   namespace: kube-system
   labels:
     k8s-app: heapster
-    version: v11
+    version: v12
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     k8s-app: heapster
-    version: v11
+    version: v12
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v11
+        version: v12
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v0.18.4
+        - image: gcr.io/google_containers/heapster:v0.18.5
           name: heapster
           resources:
             # keep request = limit to keep this container in guaranteed class