From a478a3c01aba7b65a19cb6c66a711158eb6f5140 Mon Sep 17 00:00:00 2001 From: Piotr Szczesniak Date: Mon, 30 Jan 2017 21:42:36 +0100 Subject: [PATCH 1/2] Bumped version of addon resizer --- .../addons/cluster-monitoring/google/heapster-controller.yaml | 4 ++-- .../googleinfluxdb/heapster-controller-combined.yaml | 4 ++-- .../cluster-monitoring/influxdb/heapster-controller.yaml | 4 ++-- .../cluster-monitoring/standalone/heapster-controller.yaml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml index 17f89842be66..d82ea2992128 100644 --- a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml @@ -63,7 +63,7 @@ spec: - name: ssl-certs mountPath: /etc/ssl/certs readOnly: true - - image: gcr.io/google_containers/addon-resizer:1.6 + - image: gcr.io/google_containers/addon-resizer:1.7 name: heapster-nanny resources: limits: @@ -92,7 +92,7 @@ spec: - --container=heapster - --poll-period=300000 - --estimator=exponential - - image: gcr.io/google_containers/addon-resizer:1.6 + - image: gcr.io/google_containers/addon-resizer:1.7 name: eventer-nanny resources: limits: diff --git a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml index 81fb8980fbfa..6348c9a28546 100644 --- a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml +++ b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml @@ -64,7 +64,7 @@ spec: - name: ssl-certs mountPath: /etc/ssl/certs readOnly: true - - image: gcr.io/google_containers/addon-resizer:1.6 + - image: gcr.io/google_containers/addon-resizer:1.7 name: heapster-nanny resources: limits: @@ -93,7 +93,7 @@ spec: - --container=heapster - --poll-period=300000 - --estimator=exponential - - image: gcr.io/google_containers/addon-resizer:1.6 + - image: gcr.io/google_containers/addon-resizer:1.7 name: eventer-nanny resources: limits: diff --git a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml index 718d2c56f3ea..67be975b30c2 100644 --- a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml @@ -55,7 +55,7 @@ spec: - /eventer - --source=kubernetes:'' - --sink=influxdb:http://monitoring-influxdb:8086 - - image: gcr.io/google_containers/addon-resizer:1.6 + - image: gcr.io/google_containers/addon-resizer:1.7 name: heapster-nanny resources: limits: @@ -84,7 +84,7 @@ spec: - --container=heapster - --poll-period=300000 - --estimator=exponential - - image: gcr.io/google_containers/addon-resizer:1.6 + - image: gcr.io/google_containers/addon-resizer:1.7 name: eventer-nanny resources: limits: diff --git a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml index a216f483ac34..410133d33aec 100644 --- a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml @@ -46,7 +46,7 @@ spec: command: - /heapster - --source=kubernetes.summary_api:'' - - image: gcr.io/google_containers/addon-resizer:1.6 + - image: gcr.io/google_containers/addon-resizer:1.7 name: heapster-nanny resources: limits: From f312683d9f4ffadbd5fb34b74f74ec3538b0bd8e Mon Sep 17 00:00:00 2001 From: Piotr Szczesniak Date: Tue, 31 Jan 2017 13:06:40 +0100 Subject: [PATCH 2/2] Bumped Heapster deployment version This change is required to make sure that addon manager will update it --- .../google/heapster-controller.yaml | 12 ++++++------ .../googleinfluxdb/heapster-controller-combined.yaml | 12 ++++++------ .../influxdb/heapster-controller.yaml | 12 ++++++------ .../standalone/heapster-controller.yaml | 10 +++++----- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml index d82ea2992128..e62127bfe477 100644 --- a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml @@ -14,23 +14,23 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: heapster-v1.2.0 + name: heapster-v1.2.0.1 namespace: kube-system labels: k8s-app: heapster kubernetes.io/cluster-service: "true" - version: v1.2.0 + version: v1.2.0.1 spec: replicas: 1 selector: matchLabels: k8s-app: heapster - version: v1.2.0 + version: v1.2.0.1 template: metadata: labels: k8s-app: heapster - version: v1.2.0 + version: v1.2.0.1 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]' @@ -88,7 +88,7 @@ spec: - --memory={{ base_metrics_memory }} - --extra-memory={{metrics_memory_per_node}}Mi - --threshold=5 - - --deployment=heapster-v1.2.0 + - --deployment=heapster-v1.2.0.1 - --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.2.0 + - --deployment=heapster-v1.2.0.1 - --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 6348c9a28546..62c9c76ffbc0 100644 --- a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml +++ b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml @@ -14,23 +14,23 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: heapster-v1.2.0 + name: heapster-v1.2.0.1 namespace: kube-system labels: k8s-app: heapster kubernetes.io/cluster-service: "true" - version: v1.2.0 + version: v1.2.0.1 spec: replicas: 1 selector: matchLabels: k8s-app: heapster - version: v1.2.0 + version: v1.2.0.1 template: metadata: labels: k8s-app: heapster - version: v1.2.0 + version: v1.2.0.1 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]' @@ -89,7 +89,7 @@ spec: - --memory={{ base_metrics_memory }} - --extra-memory={{ metrics_memory_per_node }}Mi - --threshold=5 - - --deployment=heapster-v1.2.0 + - --deployment=heapster-v1.2.0.1 - --container=heapster - --poll-period=300000 - --estimator=exponential @@ -118,7 +118,7 @@ spec: - --memory={{ base_eventer_memory }} - --extra-memory={{ eventer_memory_per_node }}Ki - --threshold=5 - - --deployment=heapster-v1.2.0 + - --deployment=heapster-v1.2.0.1 - --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 67be975b30c2..03231433ff53 100644 --- a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml @@ -14,23 +14,23 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: heapster-v1.2.0 + name: heapster-v1.2.0.1 namespace: kube-system labels: k8s-app: heapster kubernetes.io/cluster-service: "true" - version: v1.2.0 + version: v1.2.0.1 spec: replicas: 1 selector: matchLabels: k8s-app: heapster - version: v1.2.0 + version: v1.2.0.1 template: metadata: labels: k8s-app: heapster - version: v1.2.0 + version: v1.2.0.1 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]' @@ -80,7 +80,7 @@ spec: - --memory={{ base_metrics_memory }} - --extra-memory={{ metrics_memory_per_node }}Mi - --threshold=5 - - --deployment=heapster-v1.2.0 + - --deployment=heapster-v1.2.0.1 - --container=heapster - --poll-period=300000 - --estimator=exponential @@ -109,7 +109,7 @@ spec: - --memory={{ base_eventer_memory }} - --extra-memory={{ eventer_memory_per_node }}Ki - --threshold=5 - - --deployment=heapster-v1.2.0 + - --deployment=heapster-v1.2.0.1 - --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 410133d33aec..a27ea68301a1 100644 --- a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml @@ -12,23 +12,23 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: heapster-v1.2.0 + name: heapster-v1.2.0.1 namespace: kube-system labels: k8s-app: heapster kubernetes.io/cluster-service: "true" - version: v1.2.0 + version: v1.2.0.1 spec: replicas: 1 selector: matchLabels: k8s-app: heapster - version: v1.2.0 + version: v1.2.0.1 template: metadata: labels: k8s-app: heapster - version: v1.2.0 + version: v1.2.0.1 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]' @@ -71,7 +71,7 @@ spec: - --memory={{ base_metrics_memory }} - --extra-memory={{ metrics_memory_per_node }}Mi - --threshold=5 - - --deployment=heapster-v1.2.0 + - --deployment=heapster-v1.2.0.1 - --container=heapster - --poll-period=300000 - --estimator=exponential