github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #27268 from wojtek-t/bump_nanny_version

Browse Source 
Adjust Heapster requirements and bump nanny version
This commit is contained in:
Wojciech Tyczynski 2016-06-14 10:50:25 +02:00 committed by GitHub
commit ff1258a29e
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,7 +68,7 @@ spec:
- name: ssl-certs - name: ssl-certs
mountPath: /etc/ssl/certs mountPath: /etc/ssl/certs
readOnly: true readOnly: true
- image: gcr.io/google_containers/addon-resizer:1.2 - image: gcr.io/google_containers/addon-resizer:1.3
name: heapster-nanny name: heapster-nanny
resources: resources:
limits: limits:
@ -88,8 +88,8 @@ spec:
fieldPath: metadata.namespace fieldPath: metadata.namespace
command: command:
- /pod_nanny - /pod_nanny
- --cpu=100m - --cpu=80m
- --extra-cpu=0m - --extra-cpu=0.5m
- --memory={{ base_metrics_memory }} - --memory={{ base_metrics_memory }}
- --extra-memory={{metrics_memory_per_node}}Mi - --extra-memory={{metrics_memory_per_node}}Mi
- --threshold=5 - --threshold=5
@ -97,7 +97,7 @@ spec:
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
- image: gcr.io/google_containers/addon-resizer:1.2 - image: gcr.io/google_containers/addon-resizer:1.3
name: eventer-nanny name: eventer-nanny
resources: resources:
limits: limits:

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

@ -69,7 +69,7 @@ spec:
- name: ssl-certs - name: ssl-certs
mountPath: /etc/ssl/certs mountPath: /etc/ssl/certs
readOnly: true readOnly: true
- image: gcr.io/google_containers/addon-resizer:1.2 - image: gcr.io/google_containers/addon-resizer:1.3
name: heapster-nanny name: heapster-nanny
resources: resources:
limits: limits:
@ -89,8 +89,8 @@ spec:
fieldPath: metadata.namespace fieldPath: metadata.namespace
command: command:
- /pod_nanny - /pod_nanny
- --cpu=100m - --cpu=80m
- --extra-cpu=0m - --extra-cpu=0.5m
- --memory={{ base_metrics_memory }} - --memory={{ base_metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi - --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5 - --threshold=5
@ -98,7 +98,7 @@ spec:
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
- image: gcr.io/google_containers/addon-resizer:1.2 - image: gcr.io/google_containers/addon-resizer:1.3
name: eventer-nanny name: eventer-nanny
resources: resources:
limits: limits:

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

@ -60,7 +60,7 @@ spec:
- /eventer - /eventer
- --source=kubernetes:'' - --source=kubernetes:''
- --sink=influxdb:http://monitoring-influxdb:8086 - --sink=influxdb:http://monitoring-influxdb:8086
- image: gcr.io/google_containers/addon-resizer:1.2 - image: gcr.io/google_containers/addon-resizer:1.3
name: heapster-nanny name: heapster-nanny
resources: resources:
limits: limits:
@ -80,8 +80,8 @@ spec:
fieldPath: metadata.namespace fieldPath: metadata.namespace
command: command:
- /pod_nanny - /pod_nanny
- --cpu=100m - --cpu=80m
- --extra-cpu=0m - --extra-cpu=0.5m
- --memory={{ base_metrics_memory }} - --memory={{ base_metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi - --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5 - --threshold=5
@ -89,7 +89,7 @@ spec:
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
- image: gcr.io/google_containers/addon-resizer:1.2 - image: gcr.io/google_containers/addon-resizer:1.3
name: eventer-nanny name: eventer-nanny
resources: resources:
limits: limits:

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

@ -41,7 +41,7 @@ spec:
command: command:
- /heapster - /heapster
- --source=kubernetes.summary_api:'' - --source=kubernetes.summary_api:''
- image: gcr.io/google_containers/addon-resizer:1.2 - image: gcr.io/google_containers/addon-resizer:1.3
name: heapster-nanny name: heapster-nanny
resources: resources:
limits: limits:
@ -61,8 +61,8 @@ spec:
fieldPath: metadata.namespace fieldPath: metadata.namespace
command: command:
- /pod_nanny - /pod_nanny
- --cpu=100m - --cpu=80m
- --extra-cpu=0m - --extra-cpu=0.5m
- --memory={{ base_metrics_memory }} - --memory={{ base_metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi - --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5 - --threshold=5