From 6123df9992c6a23e27403adfbc702243a22c192d Mon Sep 17 00:00:00 2001 From: Marcin Wielgus Date: Mon, 14 Mar 2016 15:21:38 +0100 Subject: [PATCH] Heapster sizing adjustments --- .../google/heapster-controller.yaml | 20 ++++++++++--------- .../heapster-controller-combined.yaml | 20 ++++++++++--------- .../influxdb/heapster-controller.yaml | 20 ++++++++++--------- .../standalone/heapster-controller.yaml | 12 +++++------ 4 files changed, 39 insertions(+), 33 deletions(-) diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml index 4534e9afdcab4..178a41ceb8e3b 100644 --- a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml @@ -1,13 +1,15 @@ -{% set heapster_memory = "200Mi" -%} +{% set metrics_memory = "200Mi" -%} +{% set eventer_memory = "200Mi" -%} {% set num_nodes = pillar.get('num_nodes', -1) -%} {% if num_nodes >= 0 -%} - {% set heapster_memory = (200 + num_nodes * 3)|string + "Mi" -%} + {% set metrics_memory = (200 + num_nodes * 4)|string + "Mi" -%} + {% set eventer_memory = (200 * 1024 + num_nodes * 500)|string + "Ki" -%} {% endif -%} apiVersion: v1 kind: ReplicationController metadata: - name: heapster-v1.0.0-beta1 + name: heapster-v1.0.0-beta2 namespace: kube-system labels: k8s-app: heapster @@ -23,16 +25,16 @@ spec: kubernetes.io/cluster-service: "true" spec: containers: - - image: gcr.io/google_containers/heapster:v1.0.0-beta1 + - image: gcr.io/google_containers/heapster:v1.0.0-beta2 name: heapster resources: # keep request = limit to keep this container in guaranteed class limits: cpu: 100m - memory: {{ heapster_memory }} + memory: {{ metrics_memory }} requests: cpu: 100m - memory: {{ heapster_memory }} + memory: {{ metrics_memory }} command: - /heapster - --source=kubernetes.summary_api:'' @@ -42,16 +44,16 @@ spec: - name: ssl-certs mountPath: /etc/ssl/certs readOnly: true - - image: gcr.io/google_containers/heapster:v1.0.0-beta1 + - image: gcr.io/google_containers/heapster:v1.0.0-beta2 name: eventer resources: # keep request = limit to keep this container in guaranteed class limits: cpu: 100m - memory: {{ heapster_memory }} + memory: {{ eventer_memory }} requests: cpu: 100m - memory: {{ heapster_memory }} + memory: {{ eventer_memory }} command: - /eventer - --source=kubernetes:'' diff --git a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml index 98cbcfb1027ff..a9a07f6de6b51 100644 --- a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml +++ b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml @@ -1,13 +1,15 @@ -{% set heapster_memory = "200Mi" -%} +{% set metrics_memory = "200Mi" -%} +{% set eventer_memory = "200Mi" -%} {% set num_nodes = pillar.get('num_nodes', -1) -%} {% if num_nodes >= 0 -%} - {% set heapster_memory = (200 + num_nodes * 3)|string + "Mi" -%} + {% set metrics_memory = (200 + num_nodes * 4)|string + "Mi" -%} + {% set eventer_memory = (200000 + num_nodes * 500)|string + "Ki" -%} {% endif -%} apiVersion: v1 kind: ReplicationController metadata: - name: heapster-v1.0.0-beta1 + name: heapster-v1.0.0-beta2 namespace: kube-system labels: k8s-app: heapster @@ -23,16 +25,16 @@ spec: kubernetes.io/cluster-service: "true" spec: containers: - - image: gcr.io/google_containers/heapster:v1.0.0-beta1 + - image: gcr.io/google_containers/heapster:v1.0.0-beta2 name: heapster resources: # keep request = limit to keep this container in guaranteed class limits: cpu: 100m - memory: {{ heapster_memory }} + memory: {{ metrics_memory }} requests: cpu: 100m - memory: {{ heapster_memory }} + memory: {{ metrics_memory }} command: - /heapster - --source=kubernetes.summary_api:'' @@ -43,16 +45,16 @@ spec: - name: ssl-certs mountPath: /etc/ssl/certs readOnly: true - - image: gcr.io/google_containers/heapster:v1.0.0-beta1 + - image: gcr.io/google_containers/heapster:v1.0.0-beta2 name: eventer resources: # keep request = limit to keep this container in guaranteed class limits: cpu: 100m - memory: {{ heapster_memory }} + memory: {{ eventer_memory }} requests: cpu: 100m - memory: {{ heapster_memory }} + memory: {{ eventer_memory }} command: - /eventer - --source=kubernetes:'' diff --git a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml index db1e045df251c..c08dfacc01426 100644 --- a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml @@ -1,13 +1,15 @@ -{% set heapster_memory = "200Mi" -%} +{% set metrics_memory = "200Mi" -%} +{% set eventer_memory = "200Mi" -%} {% set num_nodes = pillar.get('num_nodes', -1) -%} {% if num_nodes >= 0 -%} - {% set heapster_memory = (200 + num_nodes * 3)|string + "Mi" -%} + {% set metrics_memory = (200 + num_nodes * 4)|string + "Mi" -%} + {% set eventer_memory = (200 * 1024 + num_nodes * 500)|string + "Ki" -%} {% endif -%} apiVersion: v1 kind: ReplicationController metadata: - name: heapster-v1.0.0-beta1 + name: heapster-v1.0.0-beta2 namespace: kube-system labels: k8s-app: heapster @@ -23,31 +25,31 @@ spec: kubernetes.io/cluster-service: "true" spec: containers: - - image: gcr.io/google_containers/heapster:v1.0.0-beta1 + - image: gcr.io/google_containers/heapster:v1.0.0-beta2 name: heapster resources: # keep request = limit to keep this container in guaranteed class limits: cpu: 100m - memory: {{ heapster_memory }} + memory: {{ metrics_memory }} requests: cpu: 100m - memory: {{ heapster_memory }} + memory: {{ metrics_memory }} command: - /heapster - --source=kubernetes.summary_api:'' - --sink=influxdb:http://monitoring-influxdb:8086 - --metric_resolution=60s - - image: gcr.io/google_containers/heapster:v1.0.0-beta1 + - image: gcr.io/google_containers/heapster:v1.0.0-beta2 name: eventer resources: # keep request = limit to keep this container in guaranteed class limits: cpu: 100m - memory: {{ heapster_memory }} + memory: {{ eventer_memory }} requests: cpu: 100m - memory: {{ heapster_memory }} + memory: {{ eventer_memory }} command: - /eventer - --source=kubernetes:'' diff --git a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml index 2edfba6bdc800..d194583b171d2 100644 --- a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml @@ -1,13 +1,13 @@ -{% set heapster_memory = "200Mi" -%} +{% set metrics_memory = "200Mi" -%} {% set num_nodes = pillar.get('num_nodes', -1) -%} {% if num_nodes >= 0 -%} - {% set heapster_memory = (200 + num_nodes * 3)|string + "Mi" -%} + {% set metrics_memory = (200 + num_nodes * 4)|string + "Mi" -%} {% endif -%} apiVersion: v1 kind: ReplicationController metadata: - name: heapster-v1.0.0-beta1 + name: heapster-v1.0.0-beta2 namespace: kube-system labels: k8s-app: heapster @@ -23,16 +23,16 @@ spec: kubernetes.io/cluster-service: "true" spec: containers: - - image: gcr.io/google_containers/heapster:v1.0.0-beta1 + - image: gcr.io/google_containers/heapster:v1.0.0-beta2 name: heapster resources: # keep request = limit to keep this container in guaranteed class limits: cpu: 100m - memory: {{ heapster_memory }} + memory: {{ metrics_memory }} requests: cpu: 100m - memory: {{ heapster_memory }} + memory: {{ metrics_memory }} command: - /heapster - --source=kubernetes.summary_api:''