Merge pull request #27769 from jszczepkowski/heapster-coreos

Automatic merge from submit-queue Bumped heapster version for coreos. [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]() Bumped heapster version for coreos.

Merge pull request #27769 from jszczepkowski/heapster-coreos
631772bd · k8s-merge-robot · GitHub · a8fecd0c · d545adce · 631772bd
Commit 631772bd authored Jun 21, 2016 by k8s-merge-robot Committed by GitHub Jun 21, 2016
4 changed files
--- a/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/google/heapster-controller.yaml
+++ b/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/google/heapster-controller.yaml
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: heapster-v1.1.0.beta2
+  name: heapster-v1.1.0
  namespace: kube-system
  labels:
    k8s-app: heapster
    kubernetes.io/cluster-service: "true"
-    version: v1.1.0.beta2
+    version: v1.1.0
 spec:
  replicas: 1
  selector:
    matchLabels:
      k8s-app: heapster
-      version: v1.1.0.beta2
+      version: v1.1.0
  template:
    metadata:
      labels:
        k8s-app: heapster
-        version: v1.1.0.beta2
+        version: v1.1.0
    spec:
      containers:
-        - image: gcr.io/google_containers/heapster:v1.1.0-beta2
+        - image: gcr.io/google_containers/heapster:v1.1.0
          name: heapster
          resources:
            # keep request = limit to keep this container in guaranteed class
@@ -41,7 +41,7 @@ spec:
            - name: usrsharecacerts
              mountPath: /usr/share/ca-certificates
              readOnly: true
-        - image: gcr.io/google_containers/heapster:v1.1.0-beta2
+        - image: gcr.io/google_containers/heapster:v1.1.0
          name: eventer
          resources:
            # keep request = limit to keep this container in guaranteed class
@@ -87,7 +87,7 @@ spec:
            - --memory=300Mi
            - --extra-memory=4Mi
            - --threshold=5
-            - --deployment=heapster-v1.1.0.beta2
+            - --deployment=heapster-v1.1.0
            - --container=heapster
            - --poll-period=300000
        - image: gcr.io/google_containers/addon-resizer:1.0
@@ -115,7 +115,7 @@ spec:
            - --memory=300Mi
            - --extra-memory=307200Ki
            - --threshold=5
-            - --deployment=heapster-v1.1.0.beta2
+            - --deployment=heapster-v1.1.0
            - --container=eventer
            - --poll-period=300000
      volumes:

--- a/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
+++ b/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: heapster-v1.1.0.beta2
+  name: heapster-v1.1.0
  namespace: kube-system
  labels:
    k8s-app: heapster
    kubernetes.io/cluster-service: "true"
-    version: v1.1.0.beta2
+    version: v1.1.0
 spec:
  replicas: 1
  selector:
    matchLabels:
      k8s-app: heapster
-      version: v1.1.0.beta2
+      version: v1.1.0
  template:
    metadata:
      labels:
        k8s-app: heapster
-        version: v1.1.0.beta2
+        version: v1.1.0
    spec:
      containers:
-        - image: gcr.io/google_containers/heapster:v1.1.0-beta2
+        - image: gcr.io/google_containers/heapster:v1.1.0
          name: heapster
          resources:
            # keep request = limit to keep this container in guaranteed class
@@ -42,7 +42,7 @@ spec:
            - name: usrsharecacerts
              mountPath: /usr/share/ca-certificates
              readOnly: true
-        - image: gcr.io/google_containers/heapster:v1.1.0-beta2
+        - image: gcr.io/google_containers/heapster:v1.1.0
          name: eventer
          resources:
            # keep request = limit to keep this container in guaranteed class
@@ -88,7 +88,7 @@ spec:
            - --memory=300Mi
            - --extra-memory=4Mi
            - --threshold=5
-            - --deployment=heapster-v1.1.0.beta2
+            - --deployment=heapster-v1.1.0
            - --container=heapster
            - --poll-period=300000
        - image: gcr.io/google_containers/addon-resizer:1.0
@@ -116,7 +116,7 @@ spec:
            - --memory=300Mi
            - --extra-memory=307200Ki
            - --threshold=5
-            - --deployment=heapster-v1.1.0.beta2
+            - --deployment=heapster-v1.1.0
            - --container=eventer
            - --poll-period=300000
      volumes:

--- a/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/influxdb/heapster-controller.yaml
+++ b/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/influxdb/heapster-controller.yaml
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: heapster-v1.1.0.beta2
+  name: heapster-v1.1.0
  namespace: kube-system
  labels:
    k8s-app: heapster
    kubernetes.io/cluster-service: "true"
-    version: v1.1.0.beta2
+    version: v1.1.0
 spec:
  replicas: 1
  selector:
    matchLabels:
      k8s-app: heapster
-      version: v1.1.0.beta2
+      version: v1.1.0
  template:
    metadata:
      labels:
        k8s-app: heapster
-        version: v1.1.0.beta2
+        version: v1.1.0
    spec:
      containers:
-        - image: gcr.io/google_containers/heapster:v1.1.0-beta2
+        - image: gcr.io/google_containers/heapster:v1.1.0
          name: heapster
          resources:
            # keep request = limit to keep this container in guaranteed class
@@ -34,7 +34,7 @@ spec:
            - /heapster
            - --source=kubernetes.summary_api:''
            - --sink=influxdb:http://monitoring-influxdb:8086
-        - image: gcr.io/google_containers/heapster:v1.1.0-beta2
+        - image: gcr.io/google_containers/heapster:v1.1.0
          name: eventer
          resources:
            # keep request = limit to keep this container in guaranteed class
@@ -73,7 +73,7 @@ spec:
            - --memory=300Mi
            - --extra-memory=4Mi
            - --threshold=5
-            - --deployment=heapster-v1.1.0.beta2
+            - --deployment=heapster-v1.1.0
            - --container=heapster
            - --poll-period=300000
        - image: gcr.io/google_containers/addon-resizer:1.0
@@ -101,6 +101,6 @@ spec:
            - --memory=300Mi
            - --extra-memory=307200Ki
            - --threshold=5
-            - --deployment=heapster-v1.1.0.beta2
+            - --deployment=heapster-v1.1.0
            - --container=eventer
            - --poll-period=300000
--- a/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/standalone/heapster-controller.yaml
+++ b/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/standalone/heapster-controller.yaml
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: heapster-v1.1.0.beta2
+  name: heapster-v1.1.0
  namespace: kube-system
  labels:
    k8s-app: heapster
    kubernetes.io/cluster-service: "true"
-    version: v1.1.0.beta2
+    version: v1.1.0
 spec:
  replicas: 1
  selector:
    matchLabels:
      k8s-app: heapster
-      version: v1.1.0.beta2
+      version: v1.1.0
  template:
    metadata:
      labels:
        k8s-app: heapster
-        version: v1.1.0.beta2
+        version: v1.1.0
    spec:
      containers:
-        - image: gcr.io/google_containers/heapster:v1.1.0-beta2
+        - image: gcr.io/google_containers/heapster:v1.1.0
          name: heapster
          resources:
            # keep request = limit to keep this container in guaranteed class
@@ -58,6 +58,6 @@ spec:
            - --memory=300Mi
            - --extra-memory=4Mi
            - --threshold=5
-            - --deployment=heapster-v1.1.0.beta2
+            - --deployment=heapster-v1.1.0
            - --container=heapster
            - --poll-period=300000