diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
index b3337aa6fa0..a6c643ba1de 100644
--- a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
@@ -20,30 +20,37 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: heapster-v1.2.0-beta.1
+  name: heapster-v1.2.0-beta.2
   namespace: kube-system
   labels:
     k8s-app: heapster
     kubernetes.io/cluster-service: "true"
-    version: v1.2.0-beta.1
+    version: v1.2.0-beta.2
 spec:
   replicas: 1
   selector:
     matchLabels:
       k8s-app: heapster
-      version: v1.2.0-beta.1
+      version: v1.2.0-beta.2
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v1.2.0-beta.1
+        version: v1.2.0-beta.2
       annotations:
         scheduler.alpha.kubernetes.io/critical-pod: ''
         scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v1.2.0-beta.1
+        - image: gcr.io/google_containers/heapster:v1.2.0-beta.2
           name: heapster
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: 8080
+              scheme: HTTP
+            initialDelaySeconds: 180
+            timeoutSeconds: 5
           resources:
             # keep request = limit to keep this container in guaranteed class
             limits:
@@ -60,7 +67,7 @@ spec:
             - name: ssl-certs
               mountPath: /etc/ssl/certs
               readOnly: true
-        - image: gcr.io/google_containers/heapster:v1.2.0-beta.1
+        - image: gcr.io/google_containers/heapster:v1.2.0-beta.2
           name: eventer
           resources:
             # keep request = limit to keep this container in guaranteed class
@@ -103,7 +110,7 @@ spec:
             - --memory={{ base_metrics_memory }}
             - --extra-memory={{metrics_memory_per_node}}Mi
             - --threshold=5
-            - --deployment=heapster-v1.2.0-beta.1
+            - --deployment=heapster-v1.2.0-beta.2
             - --container=heapster
             - --poll-period=300000
             - --estimator=exponential
@@ -132,7 +139,7 @@ spec:
             - --memory={{base_eventer_memory}}
             - --extra-memory={{eventer_memory_per_node}}Ki
             - --threshold=5
-            - --deployment=heapster-v1.2.0-beta.1
+            - --deployment=heapster-v1.2.0-beta.2
             - --container=eventer
             - --poll-period=300000
             - --estimator=exponential
diff --git a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
index 362f6109360..ea62e18ac48 100644
--- a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
+++ b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
@@ -20,30 +20,37 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: heapster-v1.2.0-beta.1
+  name: heapster-v1.2.0-beta.2
   namespace: kube-system
   labels:
     k8s-app: heapster
     kubernetes.io/cluster-service: "true"
-    version: v1.2.0-beta.1
+    version: v1.2.0-beta.2
 spec:
   replicas: 1
   selector:
     matchLabels:
       k8s-app: heapster
-      version: v1.2.0-beta.1
+      version: v1.2.0-beta.2
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v1.2.0-beta.1
+        version: v1.2.0-beta.2
       annotations:
         scheduler.alpha.kubernetes.io/critical-pod: ''
         scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v1.2.0-beta.1
+        - image: gcr.io/google_containers/heapster:v1.2.0-beta.2
           name: heapster
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: 8080
+              scheme: HTTP
+            initialDelaySeconds: 180
+            timeoutSeconds: 5
           resources:
             # keep request = limit to keep this container in guaranteed class
             limits:
@@ -61,7 +68,7 @@ spec:
             - name: ssl-certs
               mountPath: /etc/ssl/certs
               readOnly: true
-        - image: gcr.io/google_containers/heapster:v1.2.0-beta.1
+        - image: gcr.io/google_containers/heapster:v1.2.0-beta.2
           name: eventer
           resources:
             # keep request = limit to keep this container in guaranteed class
@@ -104,7 +111,7 @@ spec:
             - --memory={{ base_metrics_memory }}
             - --extra-memory={{ metrics_memory_per_node }}Mi
             - --threshold=5
-            - --deployment=heapster-v1.2.0-beta.1
+            - --deployment=heapster-v1.2.0-beta.2
             - --container=heapster
             - --poll-period=300000
             - --estimator=exponential
@@ -133,7 +140,7 @@ spec:
             - --memory={{ base_eventer_memory }}
             - --extra-memory={{ eventer_memory_per_node }}Ki
             - --threshold=5
-            - --deployment=heapster-v1.2.0-beta.1
+            - --deployment=heapster-v1.2.0-beta.2
             - --container=eventer
             - --poll-period=300000
             - --estimator=exponential
diff --git a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
index c0ab42d1aa8..fce29c5ba7e 100644
--- a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
@@ -20,30 +20,37 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: heapster-v1.2.0-beta.1
+  name: heapster-v1.2.0-beta.2
   namespace: kube-system
   labels:
     k8s-app: heapster
     kubernetes.io/cluster-service: "true"
-    version: v1.2.0-beta.1
+    version: v1.2.0-beta.2
 spec:
   replicas: 1
   selector:
     matchLabels:
       k8s-app: heapster
-      version: v1.2.0-beta.1
+      version: v1.2.0-beta.2
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v1.2.0-beta.1
+        version: v1.2.0-beta.2
       annotations:
         scheduler.alpha.kubernetes.io/critical-pod: ''
         scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v1.2.0-beta.1
+        - image: gcr.io/google_containers/heapster:v1.2.0-beta.2
           name: heapster
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: 8080
+              scheme: HTTP
+            initialDelaySeconds: 180
+            timeoutSeconds: 5
           resources:
             # keep request = limit to keep this container in guaranteed class
             limits:
@@ -56,7 +63,7 @@ spec:
             - /heapster
             - --source=kubernetes.summary_api:''
             - --sink=influxdb:http://monitoring-influxdb:8086
-        - image: gcr.io/google_containers/heapster:v1.2.0-beta.1
+        - image: gcr.io/google_containers/heapster:v1.2.0-beta.2
           name: eventer
           resources:
             # keep request = limit to keep this container in guaranteed class
@@ -95,7 +102,7 @@ spec:
             - --memory={{ base_metrics_memory }}
             - --extra-memory={{ metrics_memory_per_node }}Mi
             - --threshold=5
-            - --deployment=heapster-v1.2.0-beta.1
+            - --deployment=heapster-v1.2.0-beta.2
             - --container=heapster
             - --poll-period=300000
             - --estimator=exponential
@@ -124,7 +131,7 @@ spec:
             - --memory={{ base_eventer_memory }}
             - --extra-memory={{ eventer_memory_per_node }}Ki
             - --threshold=5
-            - --deployment=heapster-v1.2.0-beta.1
+            - --deployment=heapster-v1.2.0-beta.2
             - --container=eventer
             - --poll-period=300000
             - --estimator=exponential
diff --git a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
index 1df972156ea..12f3eca11d4 100644
--- a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
@@ -16,30 +16,37 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: heapster-v1.2.0-beta.1
+  name: heapster-v1.2.0-beta.2
   namespace: kube-system
   labels:
     k8s-app: heapster
     kubernetes.io/cluster-service: "true"
-    version: v1.2.0-beta.1
+    version: v1.2.0-beta.2
 spec:
   replicas: 1
   selector:
     matchLabels:
       k8s-app: heapster
-      version: v1.2.0-beta.1
+      version: v1.2.0-beta.2
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v1.2.0-beta.1
+        version: v1.2.0-beta.2
       annotations:
         scheduler.alpha.kubernetes.io/critical-pod: ''
         scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v1.2.0-beta.1
+        - image: gcr.io/google_containers/heapster:v1.2.0-beta.2
           name: heapster
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: 8080
+              scheme: HTTP
+            initialDelaySeconds: 180
+            timeoutSeconds: 5
           resources:
             # keep request = limit to keep this container in guaranteed class
             limits:
@@ -76,7 +83,7 @@ spec:
             - --memory={{ base_metrics_memory }}
             - --extra-memory={{ metrics_memory_per_node }}Mi
             - --threshold=5
-            - --deployment=heapster-v1.2.0-beta.1
+            - --deployment=heapster-v1.2.0-beta.2
             - --container=heapster
             - --poll-period=300000
             - --estimator=exponential