Merge pull request #22851 from piosz/heapster-1.0beta

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

@@ -7,26 +7,23 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: heapster-v15
+  name: heapster-v1.0.0-beta1
   namespace: kube-system
   labels:
     k8s-app: heapster
-    version: v15
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     k8s-app: heapster
-    version: v15
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v15
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v0.20.0-alpha12
+        - image: gcr.io/google_containers/heapster:v1.0.0-beta1
           name: heapster
           resources:
             # keep request = limit to keep this container in guaranteed class
@@ -45,7 +42,7 @@ spec:
             - name: ssl-certs
               mountPath: /etc/ssl/certs
               readOnly: true
-        - image: gcr.io/google_containers/heapster:v0.20.0-alpha12
+        - image: gcr.io/google_containers/heapster:v1.0.0-beta1
           name: eventer
           resources:
             # keep request = limit to keep this container in guaranteed class

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

@@ -7,26 +7,23 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: heapster-v15
+  name: heapster-v1.0.0-beta1
   namespace: kube-system
   labels:
     k8s-app: heapster
-    version: v15
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     k8s-app: heapster
-    version: v15
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v15
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v0.20.0-alpha12
+        - image: gcr.io/google_containers/heapster:v1.0.0-beta1
           name: heapster
           resources:
             # keep request = limit to keep this container in guaranteed class
@@ -46,7 +43,7 @@ spec:
             - name: ssl-certs
               mountPath: /etc/ssl/certs
               readOnly: true
-        - image: gcr.io/google_containers/heapster:v0.20.0-alpha12
+        - image: gcr.io/google_containers/heapster:v1.0.0-beta1
           name: eventer
           resources:
             # keep request = limit to keep this container in guaranteed class

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

@@ -7,26 +7,23 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: heapster-v15
+  name: heapster-v1.0.0-beta1
   namespace: kube-system
   labels:
     k8s-app: heapster
-    version: v15
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     k8s-app: heapster
-    version: v15
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v15
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v0.20.0-alpha12
+        - image: gcr.io/google_containers/heapster:v1.0.0-beta1
           name: heapster
           resources:
             # keep request = limit to keep this container in guaranteed class
@@ -41,7 +38,7 @@ spec:
             - --source=kubernetes.summary_api:''
             - --sink=influxdb:http://monitoring-influxdb:8086
             - --metric_resolution=60s
-        - image: gcr.io/google_containers/heapster:v0.20.0-alpha12
+        - image: gcr.io/google_containers/heapster:v1.0.0-beta1
           name: eventer
           resources:
             # keep request = limit to keep this container in guaranteed class

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

@@ -7,26 +7,23 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: heapster-v15
+  name: heapster-v1.0.0-beta1
   namespace: kube-system
   labels:
     k8s-app: heapster
-    version: v15
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     k8s-app: heapster
-    version: v15
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v15
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v0.20.0-alpha12
+        - image: gcr.io/google_containers/heapster:v1.0.0-beta1
           name: heapster
           resources:
             # keep request = limit to keep this container in guaranteed class