Skip to content

K
k3s
Commit 38957f8f authored by Wojciech Tyczynski's avatar Wojciech Tyczynski
Browse files
Options

Merge pull request #22022 from bprashanth/proxy_cpu_request

Kube-proxy requests 2x cpu shares of addons.
parents e63127e0 7d47d2dc
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 1 deletion
cluster/saltbase/salt/kube-proxy/init.sls
View file @ 38957f8f
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
- mode: 644 - mode: 644
- makedirs: true - makedirs: true
- dir_mode: 755 - dir_mode: 755
- context:
cpurequest: '200m'
- require: - require:
- service: docker - service: docker
- service: kubelet - service: kubelet
...@@ -26,7 +28,7 @@ ...@@ -26,7 +28,7 @@
- group: root - group: root
- mode: 644 - mode: 644
#stop legacy kube-proxy service #stop legacy kube-proxy service
stop_kube-proxy: stop_kube-proxy:
service.dead: service.dead:
- name: kube-proxy - name: kube-proxy
......
cluster/saltbase/salt/kube-proxy/kube-proxy.manifest
View file @ 38957f8f
...@@ -31,6 +31,9 @@ spec: ...@@ -31,6 +31,9 @@ spec:
containers: containers:
- name: kube-proxy - name: kube-proxy
image: {{pillar['kube_docker_registry']}}/kube-proxy:{{pillar['kube-proxy_docker_tag']}} image: {{pillar['kube_docker_registry']}}/kube-proxy:{{pillar['kube-proxy_docker_tag']}}
resources:
requests:
cpu: {{ cpurequest }}
command: command:
- /bin/sh - /bin/sh
- -c - -c
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment