C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
roles/kubernetes/node/tasks/facts.yml
View file

@ -1,14 +1,25 @@
--- ---
- name: look up docker cgroup driver - block:
shell: "docker info | grep 'Cgroup Driver' | awk -F': ' '{ print $2; }'" - name: look up docker cgroup driver
register: docker_cgroup_driver_result shell: "docker info | grep 'Cgroup Driver' | awk -F': ' '{ print $2; }'"
changed_when: false register: docker_cgroup_driver_result
when: container_manager in ['crio', 'docker'] changed_when: false
- 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,18 +27,13 @@
{%- 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:
- files: - files:
- "{{ ansible_distribution|lower }}-{{ ansible_distribution_version|lower|replace('/', '_') }}.yml" - "{{ ansible_distribution|lower }}-{{ ansible_distribution_version|lower|replace('/', '_') }}.yml"
- "{{ ansible_distribution|lower }}-{{ ansible_distribution_release }}.yml" - "{{ ansible_distribution|lower }}-{{ ansible_distribution_release }}.yml"
- "{{ ansible_distribution|lower }}-{{ ansible_distribution_major_version|lower|replace('/', '_') }}.yml" - "{{ ansible_distribution|lower }}-{{ ansible_distribution_major_version|lower|replace('/', '_') }}.yml"
- "{{ ansible_distribution|lower }}.yml" - "{{ ansible_distribution|lower }}.yml"
- "{{ ansible_os_family|lower }}.yml" - "{{ ansible_os_family|lower }}.yml"
skip: true skip: true