Merge pull request kubernetes#22993 from piosz/bump-heapster-1.0

Bumped Heapster to stable version 1.0.0 (cherry picked from commit 70036b3)
shouhong · Mar 15, 2016 · 69ecf37 · 69ecf37
1 parent eb83769
commit 69ecf37
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
@@ -9,7 +9,7 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: heapster-v1.0.0-beta2
+  name: heapster-v1.0.0
   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-beta2
+        - image: gcr.io/google_containers/heapster:v1.0.0
           name: heapster
           resources:
             # keep request = limit to keep this container in guaranteed class
@@ -44,7 +44,7 @@ spec:
             - name: ssl-certs
               mountPath: /etc/ssl/certs
               readOnly: true
-        - image: gcr.io/google_containers/heapster:v1.0.0-beta2
+        - image: gcr.io/google_containers/heapster:v1.0.0
           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
@@ -3,13 +3,13 @@
 {% set num_nodes = pillar.get('num_nodes', -1) -%}
 {% if num_nodes >= 0 -%}
   {% set metrics_memory = (200 + num_nodes * 4)|string + "Mi" -%}
-  {% set eventer_memory = (200000 + num_nodes * 500)|string + "Ki" -%}
+  {% set eventer_memory = (200 * 1024 + num_nodes * 500)|string + "Ki" -%}
 {% endif -%}
 
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: heapster-v1.0.0-beta2
+  name: heapster-v1.0.0
   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-beta2
+        - image: gcr.io/google_containers/heapster:v1.0.0
           name: heapster
           resources:
             # keep request = limit to keep this container in guaranteed class
@@ -45,7 +45,7 @@ spec:
             - name: ssl-certs
               mountPath: /etc/ssl/certs
               readOnly: true
-        - image: gcr.io/google_containers/heapster:v1.0.0-beta2
+        - image: gcr.io/google_containers/heapster:v1.0.0
           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
@@ -9,7 +9,7 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: heapster-v1.0.0-beta2
+  name: heapster-v1.0.0
   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-beta2
+        - image: gcr.io/google_containers/heapster:v1.0.0
           name: heapster
           resources:
             # keep request = limit to keep this container in guaranteed class
@@ -40,7 +40,7 @@ spec:
             - --source=kubernetes.summary_api:''
             - --sink=influxdb:http://monitoring-influxdb:8086
             - --metric_resolution=60s
-        - image: gcr.io/google_containers/heapster:v1.0.0-beta2
+        - image: gcr.io/google_containers/heapster:v1.0.0
           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
@@ -7,7 +7,7 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: heapster-v1.0.0-beta2
+  name: heapster-v1.0.0
   namespace: kube-system
   labels:
     k8s-app: heapster
@@ -23,7 +23,7 @@ spec:
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v1.0.0-beta2
+        - image: gcr.io/google_containers/heapster:v1.0.0
           name: heapster
           resources:
             # keep request = limit to keep this container in guaranteed class