Skip to content
Snippets Groups Projects
Commit a56d9de5 authored by Bogdan Dobrelya's avatar Bogdan Dobrelya Committed by Bogdan Dobrelya
Browse files

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: default avatarBogdan Dobrelya <bdobrelia@mirantis.com>
parent 6139ee3a
No related branches found
No related tags found
No related merge requests found
--- ---
- name: Weave | Copy cni plugins from hyperkube - name: Weave | Copy cni plugins from hyperkube
command: "/usr/bin/docker run --rm -v /opt/cni/bin:/cnibindir {{ hyperkube_image_repo }}:{{ hyperkube_image_tag }} /bin/cp -r /opt/cni/bin/. /cnibindir/" command: "{{ docker_bin_dir }}/docker run --rm -v /opt/cni/bin:/cnibindir {{ hyperkube_image_repo }}:{{ hyperkube_image_tag }} /bin/cp -r /opt/cni/bin/. /cnibindir/"
register: cni_task_result register: cni_task_result
until: cni_task_result.rc == 0 until: cni_task_result.rc == 0
retries: 4 retries: 4
......
WEAVE_DOCKER_ARGS="--memory={{ weave_memory_limit|regex_replace('Mi', 'M') }} --cpu-shares={{ weave_cpu_limit|regex_replace('m', '') }}"
WEAVE_PEERS="{% for host in groups['k8s-cluster'] %}{{ hostvars[host]['access_ip'] | default(hostvars[host]['ip'] | default(hostvars[host]['ansible_default_ipv4']['address'])) }}{% if not loop.last %} {% endif %}{% endfor %}" WEAVE_PEERS="{% for host in groups['k8s-cluster'] %}{{ hostvars[host]['access_ip'] | default(hostvars[host]['ip'] | default(hostvars[host]['ansible_default_ipv4']['address'])) }}{% if not loop.last %} {% endif %}{% endfor %}"
WEAVEPROXY_ARGS="--rewrite-inspect --without-dns" WEAVEPROXY_ARGS="--rewrite-inspect --without-dns"
WEAVE_SUBNET="--ipalloc-range {{ kube_pods_subnet }}" WEAVE_SUBNET="--ipalloc-range {{ kube_pods_subnet }}"
......
...@@ -6,12 +6,13 @@ After=docker.service docker.socket ...@@ -6,12 +6,13 @@ After=docker.service docker.socket
[Service] [Service]
EnvironmentFile=-/etc/weave.env EnvironmentFile=-/etc/weave.env
ExecStartPre=-/usr/bin/docker rm -f weave ExecStartPre=-{{ docker_bin_dir }}/docker rm -f weave
ExecStartPre={{ bin_dir }}/weave launch-router \ ExecStartPre={{ bin_dir }}/weave launch-router \
$WEAVE_SUBNET \ $WEAVE_SUBNET \
$WEAVE_PEERS $WEAVE_PEERS
ExecStart=/usr/bin/docker attach weave ExecStart={{ docker_bin_dir }}/docker attach weave
ExecStop={{ bin_dir }}/weave stop ExecStop={{ bin_dir }}/weave stop
Restart=on-failure
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target
...@@ -7,11 +7,11 @@ After=docker.service docker.socket ...@@ -7,11 +7,11 @@ After=docker.service docker.socket
[Service] [Service]
EnvironmentFile=-/etc/weave.%H.env EnvironmentFile=-/etc/weave.%H.env
EnvironmentFile=-/etc/weave.env EnvironmentFile=-/etc/weave.env
ExecStartPre=-/usr/bin/docker rm -f weaveproxy ExecStartPre=-{{ docker_bin_dir }}/docker rm -f weaveproxy
ExecStartPre={{ bin_dir }}/weave launch-proxy $WEAVEPROXY_ARGS ExecStartPre={{ bin_dir }}/weave launch-proxy $WEAVEPROXY_ARGS
ExecStart=/usr/bin/docker attach weaveproxy ExecStart={{ docker_bin_dir }}/docker attach weaveproxy
Restart=on-failure Restart=on-failure
ExecStop=/opt/bin/weave stop-proxy ExecStop={{ bin_dir }}/weave stop-proxy
[Install] [Install]
WantedBy=weave-network.target WantedBy=weave-network.target
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
when: ansible_service_mgr == "systemd" and services_removed.changed when: ansible_service_mgr == "systemd" and services_removed.changed
- name: reset | remove all containers - name: reset | remove all containers
shell: docker ps -aq | xargs -r docker rm -fv shell: "{{ docker_bin_dir }}/docker ps -aq | xargs -r docker rm -fv"
- name: reset | gather mounted kubelet dirs - name: reset | gather mounted kubelet dirs
shell: mount | grep /var/lib/kubelet | awk '{print $3}' | tac shell: mount | grep /var/lib/kubelet | awk '{print $3}' | tac
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
- name: kernel_info - name: kernel_info
cmd: uname -r cmd: uname -r
- name: docker_info - name: docker_info
cmd: docker info cmd: "{{ docker_bin_dir }}/docker info"
- name: ip_info - name: ip_info
cmd: ip -4 -o a cmd: ip -4 -o a
- name: route_info - name: route_info
...@@ -34,9 +34,11 @@ ...@@ -34,9 +34,11 @@
- name: weave_info - name: weave_info
cmd: weave report cmd: weave report
- name: weave_logs - name: weave_logs
cmd: docker logs weave cmd: "{{ docker_bin_dir }}/docker logs weave"
- name: kube_describe_all - name: kube_describe_all
cmd: kubectl describe all --all-namespaces cmd: kubectl describe all --all-namespaces
- name: kube_describe_nodes
cmd: kubectl describe nodes
- name: kubelet_logs - name: kubelet_logs
cmd: journalctl -u kubelet --no-pager cmd: journalctl -u kubelet --no-pager
- name: kubedns_logs - name: kubedns_logs
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment