github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10430 from GoogleCloudPlatform/revert-10260-clean

Browse Source 
Revert "Set resource limit for both heapster and influxdb container b…
This commit is contained in:
Robert Bailey 2015-06-26 17:07:52 -07:00
commit 1c83591c3a
5 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,10 +22,6 @@ 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:''

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

@ -22,10 +22,6 @@ 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:''

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

@ -22,10 +22,6 @@ 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:''

4
cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml
View File

@ -22,10 +22,6 @@ 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

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

@ -22,10 +22,6 @@ 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:''