github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 08:17:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #22367 from a-robinson/requests

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-03-05 06:18:14 -08:00
commit 886c943379
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
View File

@ -11,7 +11,10 @@ spec:
image: gcr.io/google_containers/fluentd-elasticsearch:1.15 image: gcr.io/google_containers/fluentd-elasticsearch:1.15
resources: resources:
limits: limits:
memory: 200Mi
requests:
cpu: 100m cpu: 100m
memory: 200Mi
volumeMounts: volumeMounts:
- name: varlog - name: varlog
mountPath: /var/log mountPath: /var/log

2
cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
View File

@ -12,6 +12,8 @@ spec:
image: gcr.io/google_containers/fluentd-gcp:1.17 image: gcr.io/google_containers/fluentd-gcp:1.17
resources: resources:
limits: limits:
memory: 200Mi
requests:
cpu: 100m cpu: 100m
memory: 200Mi memory: 200Mi
env: env: