mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-03-23 11:55:06 -02:30
Systemd units, limits, and bin path fixes
* Add restart for weave service unit * Reuse docker_bin_dir everythere * Limit systemd managed docker containers by CPU/RAM. Do not configure native systemd limits due to the lack of consensus in the kernel community requires out-of-tree kernel patches. Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
This commit is contained in:
committed by
Bogdan Dobrelya
parent
6139ee3add
commit
a56d9de502
@@ -13,4 +13,16 @@ kube_apiserver_node_port_range: "30000-32767"
|
||||
etcd_config_dir: /etc/ssl/etcd
|
||||
etcd_cert_dir: "{{ etcd_config_dir }}/ssl"
|
||||
|
||||
|
||||
# Limits for kube components
|
||||
kube_controller_memory_limit: 512M
|
||||
kube_controller_cpu_limit: 250m
|
||||
kube_controller_memory_requests: 170M
|
||||
kube_controller_cpu_requests: 100m
|
||||
kube_scheduler_memory_limit: 512M
|
||||
kube_scheduler_cpu_limit: 250m
|
||||
kube_scheduler_memory_requests: 170M
|
||||
kube_scheduler_cpu_requests: 100m
|
||||
kube_apiserver_memory_limit: 2000M
|
||||
kube_apiserver_cpu_limit: 800m
|
||||
kube_apiserver_memory_requests: 256M
|
||||
kube_apiserver_cpu_requests: 300m
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
tags: k8s-pre-upgrade
|
||||
|
||||
- name: Copy kubectl from hyperkube container
|
||||
command: "/usr/bin/docker run --rm -v {{ bin_dir }}:/systembindir {{ hyperkube_image_repo }}:{{ hyperkube_image_tag }} /bin/cp /hyperkube /systembindir/kubectl"
|
||||
command: "{{ docker_bin_dir }}/docker run --rm -v {{ bin_dir }}:/systembindir {{ hyperkube_image_repo }}:{{ hyperkube_image_tag }} /bin/cp /hyperkube /systembindir/kubectl"
|
||||
register: kube_task_result
|
||||
until: kube_task_result.rc == 0
|
||||
retries: 4
|
||||
|
||||
@@ -12,6 +12,13 @@ spec:
|
||||
- name: kube-apiserver
|
||||
image: {{ hyperkube_image_repo }}:{{ hyperkube_image_tag }}
|
||||
imagePullPolicy: {{ k8s_image_pull_policy }}
|
||||
resources:
|
||||
limits:
|
||||
cpu: {{ kube_apiserver_cpu_limit }}
|
||||
memory: {{ kube_apiserver_memory_limit }}
|
||||
requests:
|
||||
cpu: {{ kube_apiserver_cpu_requests }}
|
||||
memory: {{ kube_apiserver_memory_requests }}
|
||||
command:
|
||||
- /hyperkube
|
||||
- apiserver
|
||||
|
||||
@@ -11,6 +11,13 @@ spec:
|
||||
- name: kube-controller-manager
|
||||
image: {{ hyperkube_image_repo }}:{{ hyperkube_image_tag }}
|
||||
imagePullPolicy: {{ k8s_image_pull_policy }}
|
||||
resources:
|
||||
limits:
|
||||
cpu: {{ kube_controller_cpu_limit }}
|
||||
memory: {{ kube_controller_memory_limit }}
|
||||
requests:
|
||||
cpu: {{ kube_controller_cpu_requests }}
|
||||
memory: {{ kube_controller_memory_requests }}
|
||||
command:
|
||||
- /hyperkube
|
||||
- controller-manager
|
||||
|
||||
@@ -11,6 +11,13 @@ spec:
|
||||
- name: kube-scheduler
|
||||
image: {{ hyperkube_image_repo }}:{{ hyperkube_image_tag }}
|
||||
imagePullPolicy: {{ k8s_image_pull_policy }}
|
||||
resources:
|
||||
limits:
|
||||
cpu: {{ kube_scheduler_cpu_limit }}
|
||||
memory: {{ kube_scheduler_memory_limit }}
|
||||
requests:
|
||||
cpu: {{ kube_scheduler_cpu_requests }}
|
||||
memory: {{ kube_scheduler_memory_requests }}
|
||||
command:
|
||||
- /hyperkube
|
||||
- scheduler
|
||||
|
||||
Reference in New Issue
Block a user