epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2025-12-14 13:54:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix kubelet cgroup driver detection for crio (#6331)

Browse Source 
* Fix kubelet cgroup driver detection for crio

Remove fact standalone_kubelet since it is not used

* Fix yamllint complaints of roles/kubernetes/node/tasks/facts.yml

Co-authored-by: Hans Feldt <hafe@users.noreply.github.com>
This commit is contained in:
Hans Feldt
2020-06-30 11:32:05 +02:00
committed by GitHub
parent f515898cb5
commit ae003af262
1 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
roles/kubernetes/node/tasks/facts.yml
View File

@@ -1,14 +1,25 @@
--- ---
- name: look up docker cgroup driver - block:
- name: look up docker cgroup driver
shell: "docker info | grep 'Cgroup Driver' | awk -F': ' '{ print $2; }'" shell: "docker info | grep 'Cgroup Driver' | awk -F': ' '{ print $2; }'"
register: docker_cgroup_driver_result register: docker_cgroup_driver_result
changed_when: false changed_when: false
when: container_manager in ['crio', 'docker']
- name: set standalone_kubelet fact - name: set kubelet_cgroup_driver_detected fact for docker
set_fact: set_fact:
standalone_kubelet: >- kubelet_cgroup_driver_detected: "{{ docker_cgroup_driver_result.stdout }}"
{%- if inventory_hostname in groups['kube-master'] and inventory_hostname not in groups['kube-node'] -%}true{%- else -%}false{%- endif -%} when: container_manager == 'docker'
- block:
- name: look up crio cgroup driver
shell: "crio-status info | grep 'cgroup driver' | awk -F': ' '{ print $2; }'"
register: crio_cgroup_driver_result
changed_when: false
- name: set kubelet_cgroup_driver_detected fact for crio
set_fact:
kubelet_cgroup_driver_detected: "{{ crio_cgroup_driver_result.stdout }}"
when: container_manager == 'crio'
- name: set kubelet_cgroup_driver_detected fact for containerd - name: set kubelet_cgroup_driver_detected fact for containerd
set_fact: set_fact:
@@ -16,11 +27,6 @@
{%- if containerd_use_systemd_cgroup -%}systemd{%- else -%}cgroupfs{%- endif -%} {%- if containerd_use_systemd_cgroup -%}systemd{%- else -%}cgroupfs{%- endif -%}
when: container_manager == 'containerd' when: container_manager == 'containerd'
- name: set kubelet_cgroup_driver_detected fact for other engines
set_fact:
kubelet_cgroup_driver_detected: "{{ docker_cgroup_driver_result.stdout }}"
when: container_manager in ['crio', 'docker']
- name: os specific vars - name: os specific vars
include_vars: "{{ item }}" include_vars: "{{ item }}"
with_first_found: with_first_found: