Merge pull request #23470 from piosz/heapster-v1.1.0-beta1

cluster/addons/cluster-monitoring/google/heapster-controller.yaml

@@ -11,7 +11,7 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: heapster
+  name: heapster-v1.1.0-beta1
   namespace: kube-system
   labels:
     k8s-app: heapster
@@ -28,7 +28,7 @@ spec:
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v1.0.0
+        - image: gcr.io/google_containers/heapster:v1.1.0-beta1
           name: heapster
           resources:
             # keep request = limit to keep this container in guaranteed class
@@ -47,7 +47,7 @@ spec:
             - name: ssl-certs
               mountPath: /etc/ssl/certs
               readOnly: true
-        - image: gcr.io/google_containers/heapster:v1.0.0
+        - image: gcr.io/google_containers/heapster:v1.1.0-beta1
           name: eventer
           resources:
             # keep request = limit to keep this container in guaranteed class
@@ -90,7 +90,7 @@ spec:
             - --memory={{ metrics_memory }}
             - --extra-memory={{metrics_memory_per_node}}Mi
             - --threshold=5
-            - --deployment=heapster
+            - --deployment=heapster-v1.1.0-beta1
             - --container=heapster
             - --poll-period=300000
         - image: gcr.io/google_containers/addon-resizer:1.0
@@ -118,7 +118,7 @@ spec:
             - --memory={{eventer_memory}}
             - --extra-memory={{eventer_memory_per_node}}Ki
             - --threshold=5
-            - --deployment=heapster
+            - --deployment=heapster-v1.1.0-beta1
             - --container=eventer
             - --poll-period=300000
       volumes:

cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml

@@ -11,7 +11,7 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: heapster
+  name: heapster-v1.1.0-beta1
   namespace: kube-system
   labels:
     k8s-app: heapster
@@ -28,7 +28,7 @@ spec:
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v1.0.0
+        - image: gcr.io/google_containers/heapster:v1.1.0-beta1
           name: heapster
           resources:
             # keep request = limit to keep this container in guaranteed class
@@ -48,7 +48,7 @@ spec:
             - name: ssl-certs
               mountPath: /etc/ssl/certs
               readOnly: true
-        - image: gcr.io/google_containers/heapster:v1.0.0
+        - image: gcr.io/google_containers/heapster:v1.1.0-beta1
           name: eventer
           resources:
             # keep request = limit to keep this container in guaranteed class
@@ -91,7 +91,7 @@ spec:
             - --memory={{ metrics_memory }}
             - --extra-memory={{ metrics_memory_per_node }}Mi
             - --threshold=5
-            - --deployment=heapster
+            - --deployment=heapster-v1.1.0-beta1
             - --container=heapster
             - --poll-period=300000
         - image: gcr.io/google_containers/addon-resizer:1.0
@@ -119,7 +119,7 @@ spec:
             - --memory={{ eventer_memory }}
             - --extra-memory={{ eventer_memory_per_node }}Ki
             - --threshold=5
-            - --deployment=heapster
+            - --deployment=heapster-v1.1.0-beta1
             - --container=eventer
             - --poll-period=300000
       volumes:

cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml

@@ -11,7 +11,7 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: heapster
+  name: heapster-v1.1.0-beta1
   namespace: kube-system
   labels:
     k8s-app: heapster
@@ -28,7 +28,7 @@ spec:
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v1.0.0
+        - image: gcr.io/google_containers/heapster:v1.1.0-beta1
           name: heapster
           resources:
             # keep request = limit to keep this container in guaranteed class
@@ -43,7 +43,7 @@ spec:
             - --source=kubernetes.summary_api:''
             - --sink=influxdb:http://monitoring-influxdb:8086
             - --metric_resolution=60s
-        - image: gcr.io/google_containers/heapster:v1.0.0
+        - image: gcr.io/google_containers/heapster:v1.1.0-beta1
           name: eventer
           resources:
             # keep request = limit to keep this container in guaranteed class
@@ -82,7 +82,7 @@ spec:
             - --memory={{ metrics_memory }}
             - --extra-memory={{ metrics_memory_per_node }}Mi
             - --threshold=5
-            - --deployment=heapster
+            - --deployment=heapster-v1.1.0-beta1
             - --container=heapster
             - --poll-period=300000
         - image: gcr.io/google_containers/addon-resizer:1.0
@@ -110,7 +110,7 @@ spec:
             - --memory={{ eventer_memory }}
             - --extra-memory={{ eventer_memory_per_node }}Ki
             - --threshold=5
-            - --deployment=heapster
+            - --deployment=heapster-v1.1.0-beta1
             - --container=eventer
             - --poll-period=300000
 

cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml

@@ -8,7 +8,7 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: heapster
+  name: heapster-v1.1.0-beta1
   namespace: kube-system
   labels:
     k8s-app: heapster
@@ -25,7 +25,7 @@ spec:
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v1.0.0
+        - image: gcr.io/google_containers/heapster:v1.1.0-beta1
           name: heapster
           resources:
             # keep request = limit to keep this container in guaranteed class
@@ -64,6 +64,6 @@ spec:
             - --memory={{ metrics_memory }}
             - --extra-memory={{ metrics_memory_per_node }}Mi
             - --threshold=5
-            - --deployment=heapster
+            - --deployment=heapster-v1.1.0-beta1
             - --container=heapster
             - --poll-period=300000