Merge pull request #22022 from bprashanth/proxy_cpu_request

Kube-proxy requests 2x cpu shares of addons.
This commit is contained in:
Wojciech Tyczynski
2016-02-26 07:15:10 +01:00
2 changed files with 6 additions and 1 deletions

View File

@@ -16,6 +16,8 @@
- mode: 644
- makedirs: true
- dir_mode: 755
- context:
cpurequest: '200m'
- require:
- service: docker
- service: kubelet
@@ -26,7 +28,7 @@
- group: root
- mode: 644
#stop legacy kube-proxy service
#stop legacy kube-proxy service
stop_kube-proxy:
service.dead:
- name: kube-proxy

View File

@@ -31,6 +31,9 @@ spec:
containers:
- name: kube-proxy
image: {{pillar['kube_docker_registry']}}/kube-proxy:{{pillar['kube-proxy_docker_tag']}}
resources:
requests:
cpu: {{ cpurequest }}
command:
- /bin/sh
- -c