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

Merge pull request #21983 from gmarek/influxdb

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-25 21:15:33 -08:00
parent 95b7fbf6f8 98eb12e1ed
commit eaffdf8b63
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,10 +26,10 @@ spec:
# 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: 200Mi memory: 500Mi
requests: requests:
cpu: 100m cpu: 100m
memory: 200Mi memory: 500Mi
ports: ports:
- containerPort: 8083 - containerPort: 8083
hostPort: 8083 hostPort: 8083

2
cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml
View File

@@ -25,7 +25,7 @@ spec:
resources: resources:
limits: limits:
cpu: 100m cpu: 100m
memory: 200Mi memory: 500Mi
ports: ports:
- containerPort: 8083 - containerPort: 8083
hostPort: 8083 hostPort: 8083