From 8fff5319db6387de96fcd1e93cba7c6b2597d832 Mon Sep 17 00:00:00 2001 From: Piotr Szczesniak Date: Thu, 16 Jun 2016 17:04:53 +0200 Subject: [PATCH] Bumped Heapster to v1.1.0 --- .../google/heapster-controller.yaml | 16 ++++++++-------- .../heapster-controller-combined.yaml | 16 ++++++++-------- .../influxdb/heapster-controller.yaml | 16 ++++++++-------- .../standalone/heapster-controller.yaml | 12 ++++++------ test/kubemark/resources/heapster_template.json | 12 ++++++------ 5 files changed, 36 insertions(+), 36 deletions(-) diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml index fb842aa076663..c046aacdcab9f 100644 --- a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml @@ -16,26 +16,26 @@ 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 @@ -53,7 +53,7 @@ spec: - name: ssl-certs mountPath: /etc/ssl/certs 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 @@ -96,7 +96,7 @@ spec: - --memory={{ base_metrics_memory }} - --extra-memory={{metrics_memory_per_node}}Mi - --threshold=5 - - --deployment=heapster-v1.1.0.beta2 + - --deployment=heapster-v1.1.0 - --container=heapster - --poll-period=300000 - --estimator=exponential @@ -125,7 +125,7 @@ spec: - --memory={{base_eventer_memory}} - --extra-memory={{eventer_memory_per_node}}Ki - --threshold=5 - - --deployment=heapster-v1.1.0.beta2 + - --deployment=heapster-v1.1.0 - --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 11f66f268c838..7af320e6ce583 100644 --- a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml +++ b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml @@ -16,26 +16,26 @@ 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 @@ -54,7 +54,7 @@ spec: - name: ssl-certs mountPath: /etc/ssl/certs 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 @@ -97,7 +97,7 @@ spec: - --memory={{ base_metrics_memory }} - --extra-memory={{ metrics_memory_per_node }}Mi - --threshold=5 - - --deployment=heapster-v1.1.0.beta2 + - --deployment=heapster-v1.1.0 - --container=heapster - --poll-period=300000 - --estimator=exponential @@ -126,7 +126,7 @@ spec: - --memory={{ base_eventer_memory }} - --extra-memory={{ eventer_memory_per_node }}Ki - --threshold=5 - - --deployment=heapster-v1.1.0.beta2 + - --deployment=heapster-v1.1.0 - --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 eaee0c1b6fa2c..3a56781767bce 100644 --- a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml @@ -16,26 +16,26 @@ 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 @@ -49,7 +49,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 @@ -88,7 +88,7 @@ spec: - --memory={{ base_metrics_memory }} - --extra-memory={{ metrics_memory_per_node }}Mi - --threshold=5 - - --deployment=heapster-v1.1.0.beta2 + - --deployment=heapster-v1.1.0 - --container=heapster - --poll-period=300000 - --estimator=exponential @@ -117,7 +117,7 @@ spec: - --memory={{ base_eventer_memory }} - --extra-memory={{ eventer_memory_per_node }}Ki - --threshold=5 - - --deployment=heapster-v1.1.0.beta2 + - --deployment=heapster-v1.1.0 - --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 134a692350d13..a6b2ab5fb1d04 100644 --- a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml @@ -12,26 +12,26 @@ 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 @@ -69,7 +69,7 @@ spec: - --memory={{ base_metrics_memory }} - --extra-memory={{ metrics_memory_per_node }}Mi - --threshold=5 - - --deployment=heapster-v1.1.0.beta2 + - --deployment=heapster-v1.1.0 - --container=heapster - --poll-period=300000 - --estimator=exponential diff --git a/test/kubemark/resources/heapster_template.json b/test/kubemark/resources/heapster_template.json index b88ad74510ca0..1dc5e22576a0b 100644 --- a/test/kubemark/resources/heapster_template.json +++ b/test/kubemark/resources/heapster_template.json @@ -2,23 +2,23 @@ "kind": "ReplicationController", "apiVersion": "v1", "metadata": { - "name": "heapster-v1.1.0.beta1", + "name": "heapster-v1.1.0", "labels": { "k8s-app": "heapster", - "version": "v1.1.0.beta1" + "version": "v1.1.0" } }, "spec": { "replicas": 1, "selector": { "k8s-app": "heapster", - "version": "v1.1.0.beta1" + "version": "v1.1.0" }, "template": { "metadata": { "labels": { "k8s-app": "heapster", - "version": "v1.1.0.beta1" + "version": "v1.1.0" } }, "spec": { @@ -33,7 +33,7 @@ "containers": [ { "name": "heapster", - "image": "gcr.io/google_containers/heapster:v1.1.0-beta1", + "image": "gcr.io/google_containers/heapster:v1.1.0", "resources": { "requests": { "cpu": "100m", @@ -55,7 +55,7 @@ }, { "name": "eventer", - "image": "gcr.io/google_containers/heapster:v1.1.0-beta1", + "image": "gcr.io/google_containers/heapster:v1.1.0", "resources": { "requests": { "cpu": "100m",