Merge pull request #10260 from dchen1107/clean

Set resource limit for both heapster and influxdb container based on
This commit is contained in:
Jeff Lowdermilk 2015-06-23 15:57:53 -07:00
commit c1a7055701
5 changed files with 20 additions and 0 deletions

View File

@ -22,6 +22,10 @@ spec:
containers:
- image: gcr.io/google_containers/heapster:v0.14.3
name: heapster
resources:
limits:
cpu: 200m
memory: 2.5Gi
command:
- /heapster
- --source=kubernetes:''

View File

@ -22,6 +22,10 @@ spec:
containers:
- image: gcr.io/google_containers/heapster:v0.14.3
name: heapster
resources:
limits:
cpu: 200m
memory: 2.5Gi
command:
- /heapster
- --source=kubernetes:''

View File

@ -22,6 +22,10 @@ spec:
containers:
- image: gcr.io/google_containers/heapster:v0.14.3
name: heapster
resources:
limits:
cpu: 200m
memory: 2.5Gi
command:
- /heapster
- --source=kubernetes:''

View File

@ -22,6 +22,10 @@ spec:
containers:
- image: gcr.io/google_containers/heapster_influxdb:v0.3
name: influxdb
resources:
limits:
cpu: 300m
memory: 2Gi
ports:
- containerPort: 8083
hostPort: 8083

View File

@ -22,6 +22,10 @@ spec:
containers:
- image: gcr.io/google_containers/heapster:v0.14.3
name: heapster
resources:
limits:
cpu: 200m
memory: 2.5Gi
command:
- /heapster
- --source=kubernetes:''