Commit c1a70557 authored by Jeff Lowdermilk's avatar Jeff Lowdermilk

Merge pull request #10260 from dchen1107/clean

Set resource limit for both heapster and influxdb container based on
parents 6dc69920 e0186c3b
...@@ -22,6 +22,10 @@ spec: ...@@ -22,6 +22,10 @@ spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v0.14.3 - image: gcr.io/google_containers/heapster:v0.14.3
name: heapster name: heapster
resources:
limits:
cpu: 200m
memory: 2.5Gi
command: command:
- /heapster - /heapster
- --source=kubernetes:'' - --source=kubernetes:''
......
...@@ -22,6 +22,10 @@ spec: ...@@ -22,6 +22,10 @@ spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v0.14.3 - image: gcr.io/google_containers/heapster:v0.14.3
name: heapster name: heapster
resources:
limits:
cpu: 200m
memory: 2.5Gi
command: command:
- /heapster - /heapster
- --source=kubernetes:'' - --source=kubernetes:''
......
...@@ -22,6 +22,10 @@ spec: ...@@ -22,6 +22,10 @@ spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v0.14.3 - image: gcr.io/google_containers/heapster:v0.14.3
name: heapster name: heapster
resources:
limits:
cpu: 200m
memory: 2.5Gi
command: command:
- /heapster - /heapster
- --source=kubernetes:'' - --source=kubernetes:''
......
...@@ -22,6 +22,10 @@ spec: ...@@ -22,6 +22,10 @@ spec:
containers: containers:
- image: gcr.io/google_containers/heapster_influxdb:v0.3 - image: gcr.io/google_containers/heapster_influxdb:v0.3
name: influxdb name: influxdb
resources:
limits:
cpu: 300m
memory: 2Gi
ports: ports:
- containerPort: 8083 - containerPort: 8083
hostPort: 8083 hostPort: 8083
......
...@@ -22,6 +22,10 @@ spec: ...@@ -22,6 +22,10 @@ spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v0.14.3 - image: gcr.io/google_containers/heapster:v0.14.3
name: heapster name: heapster
resources:
limits:
cpu: 200m
memory: 2.5Gi
command: command:
- /heapster - /heapster
- --source=kubernetes:'' - --source=kubernetes:''
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment