github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #22940 from mwielgus/heapster-adjustments

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-03-14 14:34:01 -07:00
commit f899a40c85
4 changed files with 39 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cluster/addons/cluster-monitoring/google/heapster-controller.yaml
View File

@ -1,13 +1,15 @@
{% set heapster_memory = "200Mi" -%} {% set metrics_memory = "200Mi" -%}
{% set eventer_memory = "200Mi" -%}
{% set num_nodes = pillar.get('num_nodes', -1) -%} {% set num_nodes = pillar.get('num_nodes', -1) -%}
{% if num_nodes >= 0 -%} {% 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 -%} {% endif -%}
apiVersion: v1 apiVersion: v1
kind: ReplicationController kind: ReplicationController
metadata: metadata:
name: heapster-v1.0.0-beta1 name: heapster-v1.0.0-beta2
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
@ -23,16 +25,16 @@ spec:
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v1.0.0-beta1 - image: gcr.io/google_containers/heapster:v1.0.0-beta2
name: heapster name: heapster
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
limits: limits:
cpu: 100m cpu: 100m
memory: {{ heapster_memory }} memory: {{ metrics_memory }}
requests: requests:
cpu: 100m cpu: 100m
memory: {{ heapster_memory }} memory: {{ metrics_memory }}
command: command:
- /heapster - /heapster
- --source=kubernetes.summary_api:'' - --source=kubernetes.summary_api:''
@ -42,16 +44,16 @@ spec:
- name: ssl-certs - name: ssl-certs
mountPath: /etc/ssl/certs mountPath: /etc/ssl/certs
readOnly: true readOnly: true
- image: gcr.io/google_containers/heapster:v1.0.0-beta1 - image: gcr.io/google_containers/heapster:v1.0.0-beta2
name: eventer name: eventer
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
limits: limits:
cpu: 100m cpu: 100m
memory: {{ heapster_memory }} memory: {{ eventer_memory }}
requests: requests:
cpu: 100m cpu: 100m
memory: {{ heapster_memory }} memory: {{ eventer_memory }}
command: command:
- /eventer - /eventer
- --source=kubernetes:'' - --source=kubernetes:''

20
cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
View File

@ -1,13 +1,15 @@
{% set heapster_memory = "200Mi" -%} {% set metrics_memory = "200Mi" -%}
{% set eventer_memory = "200Mi" -%}
{% set num_nodes = pillar.get('num_nodes', -1) -%} {% set num_nodes = pillar.get('num_nodes', -1) -%}
{% if num_nodes >= 0 -%} {% 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 -%} {% endif -%}
apiVersion: v1 apiVersion: v1
kind: ReplicationController kind: ReplicationController
metadata: metadata:
name: heapster-v1.0.0-beta1 name: heapster-v1.0.0-beta2
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
@ -23,16 +25,16 @@ spec:
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v1.0.0-beta1 - image: gcr.io/google_containers/heapster:v1.0.0-beta2
name: heapster name: heapster
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
limits: limits:
cpu: 100m cpu: 100m
memory: {{ heapster_memory }} memory: {{ metrics_memory }}
requests: requests:
cpu: 100m cpu: 100m
memory: {{ heapster_memory }} memory: {{ metrics_memory }}
command: command:
- /heapster - /heapster
- --source=kubernetes.summary_api:'' - --source=kubernetes.summary_api:''
@ -43,16 +45,16 @@ spec:
- name: ssl-certs - name: ssl-certs
mountPath: /etc/ssl/certs mountPath: /etc/ssl/certs
readOnly: true readOnly: true
- image: gcr.io/google_containers/heapster:v1.0.0-beta1 - image: gcr.io/google_containers/heapster:v1.0.0-beta2
name: eventer name: eventer
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
limits: limits:
cpu: 100m cpu: 100m
memory: {{ heapster_memory }} memory: {{ eventer_memory }}
requests: requests:
cpu: 100m cpu: 100m
memory: {{ heapster_memory }} memory: {{ eventer_memory }}
command: command:
- /eventer - /eventer
- --source=kubernetes:'' - --source=kubernetes:''

20
cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
View File

@ -1,13 +1,15 @@
{% set heapster_memory = "200Mi" -%} {% set metrics_memory = "200Mi" -%}
{% set eventer_memory = "200Mi" -%}
{% set num_nodes = pillar.get('num_nodes', -1) -%} {% set num_nodes = pillar.get('num_nodes', -1) -%}
{% if num_nodes >= 0 -%} {% 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 -%} {% endif -%}
apiVersion: v1 apiVersion: v1
kind: ReplicationController kind: ReplicationController
metadata: metadata:
name: heapster-v1.0.0-beta1 name: heapster-v1.0.0-beta2
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
@ -23,31 +25,31 @@ spec:
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v1.0.0-beta1 - image: gcr.io/google_containers/heapster:v1.0.0-beta2
name: heapster name: heapster
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
limits: limits:
cpu: 100m cpu: 100m
memory: {{ heapster_memory }} memory: {{ metrics_memory }}
requests: requests:
cpu: 100m cpu: 100m
memory: {{ heapster_memory }} memory: {{ metrics_memory }}
command: command:
- /heapster - /heapster
- --source=kubernetes.summary_api:'' - --source=kubernetes.summary_api:''
- --sink=influxdb:http://monitoring-influxdb:8086 - --sink=influxdb:http://monitoring-influxdb:8086
- --metric_resolution=60s - --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 name: eventer
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
limits: limits:
cpu: 100m cpu: 100m
memory: {{ heapster_memory }} memory: {{ eventer_memory }}
requests: requests:
cpu: 100m cpu: 100m
memory: {{ heapster_memory }} memory: {{ eventer_memory }}
command: command:
- /eventer - /eventer
- --source=kubernetes:'' - --source=kubernetes:''

12
cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
View File

@ -1,13 +1,13 @@
{% set heapster_memory = "200Mi" -%} {% set metrics_memory = "200Mi" -%}
{% set num_nodes = pillar.get('num_nodes', -1) -%} {% set num_nodes = pillar.get('num_nodes', -1) -%}
{% if num_nodes >= 0 -%} {% if num_nodes >= 0 -%}
{% set heapster_memory = (200 + num_nodes * 3)|string + "Mi" -%} {% set metrics_memory = (200 + num_nodes * 4)|string + "Mi" -%}
{% endif -%} {% endif -%}
apiVersion: v1 apiVersion: v1
kind: ReplicationController kind: ReplicationController
metadata: metadata:
name: heapster-v1.0.0-beta1 name: heapster-v1.0.0-beta2
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
@ -23,16 +23,16 @@ spec:
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v1.0.0-beta1 - image: gcr.io/google_containers/heapster:v1.0.0-beta2
name: heapster name: heapster
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
limits: limits:
cpu: 100m cpu: 100m
memory: {{ heapster_memory }} memory: {{ metrics_memory }}
requests: requests:
cpu: 100m cpu: 100m
memory: {{ heapster_memory }} memory: {{ metrics_memory }}
command: command:
- /heapster - /heapster
- --source=kubernetes.summary_api:'' - --source=kubernetes.summary_api:''