Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
045a6dca
Commit
045a6dca
authored
Jun 22, 2017
by
Kubernetes Submit Queue
Committed by
GitHub
Jun 22, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #47906 from gmarek/fluentd
Automatic merge from submit-queue Decrese fluentd cpu request Fix #47905 cc @piosz - this should fix your tests. cc @dchen1107
parents
d73a75b4
8427d5a2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
fluentd-es-ds.yaml
cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml
+1
-1
fluentd-gcp-ds.yaml
cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
+1
-1
No files found.
cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml
View file @
045a6dca
...
@@ -32,7 +32,7 @@ spec:
...
@@ -32,7 +32,7 @@ spec:
limits
:
limits
:
memory
:
200Mi
memory
:
200Mi
requests
:
requests
:
cpu
:
10
0m
cpu
:
9
0m
memory
:
200Mi
memory
:
200Mi
volumeMounts
:
volumeMounts
:
-
name
:
varlog
-
name
:
varlog
...
...
cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
View file @
045a6dca
...
@@ -44,7 +44,7 @@ spec:
...
@@ -44,7 +44,7 @@ spec:
limits
:
limits
:
memory
:
300Mi
memory
:
300Mi
requests
:
requests
:
cpu
:
10
0m
cpu
:
9
0m
memory
:
200Mi
memory
:
200Mi
volumeMounts
:
volumeMounts
:
-
name
:
varlog
-
name
:
varlog
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment