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
2e89f555
Commit
2e89f555
authored
Mar 30, 2016
by
Alex Mohr
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #23646 from cjcullen/kubeproxy
Change kube-proxy & fluentd CPU request to 20m/80m.
parents
56de2d11
26a6c66d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
3 deletions
+10
-3
node.yaml
cluster/gce/trusty/node.yaml
+1
-1
fluentd-gcp.yaml
cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
+3
-1
init.sls
cluster/saltbase/salt/kube-proxy/init.sls
+6
-1
No files found.
cluster/gce/trusty/node.yaml
View file @
2e89f555
...
...
@@ -215,7 +215,7 @@ script
sed -i -e "s/{{pillar\['kube_docker_registry'\]}}/${kube_docker_registry}/g" ${tmp_file}
sed -i -e "s/{{pillar\['kube-proxy_docker_tag'\]}}/${kube_proxy_docker_tag}/g" ${tmp_file}
sed -i -e "s/{{test_args}}/${test_args}/g" ${tmp_file}
sed -i -e "s/{{ cpurequest }}/20
0
m/g" ${tmp_file}
sed -i -e "s/{{ cpurequest }}/20m/g" ${tmp_file}
sed -i -e "s/{{log_level}}/${log_level}/g" ${tmp_file}
sed -i -e "s/{{api_servers_with_port}}/${api_servers}/g" ${tmp_file}
...
...
cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
View file @
2e89f555
...
...
@@ -14,7 +14,9 @@ spec:
limits
:
memory
:
200Mi
requests
:
cpu
:
100m
# Any change here should be accompanied by a proportional change in CPU
# requests of other per-node add-ons (e.g. kube-proxy).
cpu
:
80m
memory
:
200Mi
env
:
-
name
:
FLUENTD_ARGS
...
...
cluster/saltbase/salt/kube-proxy/init.sls
View file @
2e89f555
...
...
@@ -17,7 +17,12 @@
- makedirs: true
- dir_mode: 755
- context:
cpurequest: '200m'
# 20m might cause kube-proxy CPU starvation on full nodes, resulting in
# delayed service updates. But, giving it more would be a breaking change
# to the overhead requirements for existing clusters.
# Any change here should be accompanied by a proportional change in CPU
# requests of other per-node add-ons (e.g. fluentd).
cpurequest: '20m'
- require:
- service: docker
- service: kubelet
...
...
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