forked from kubernetes-sigs/kubespray
-
Notifications
You must be signed in to change notification settings - Fork 51
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix kubelet cgroup driver detection for crio (kubernetes-sigs#6331)
* 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>
- Loading branch information
Showing
1 changed file
with
27 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,33 +1,39 @@ | ||
--- | ||
- name: look up docker cgroup driver | ||
shell: "docker info | grep 'Cgroup Driver' | awk -F': ' '{ print $2; }'" | ||
register: docker_cgroup_driver_result | ||
changed_when: false | ||
when: container_manager in ['crio', 'docker'] | ||
- block: | ||
- name: look up docker cgroup driver | ||
shell: "docker info | grep 'Cgroup Driver' | awk -F': ' '{ print $2; }'" | ||
register: docker_cgroup_driver_result | ||
changed_when: false | ||
|
||
- name: set standalone_kubelet fact | ||
set_fact: | ||
standalone_kubelet: >- | ||
{%- if inventory_hostname in groups['kube-master'] and inventory_hostname not in groups['kube-node'] -%}true{%- else -%}false{%- endif -%} | ||
- name: set kubelet_cgroup_driver_detected fact for docker | ||
set_fact: | ||
kubelet_cgroup_driver_detected: "{{ docker_cgroup_driver_result.stdout }}" | ||
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 | ||
set_fact: | ||
kubelet_cgroup_driver_detected: >- | ||
{%- if containerd_use_systemd_cgroup -%}systemd{%- else -%}cgroupfs{%- endif -%} | ||
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 | ||
include_vars: "{{ item }}" | ||
with_first_found: | ||
- files: | ||
- "{{ ansible_distribution|lower }}-{{ ansible_distribution_version|lower|replace('/', '_') }}.yml" | ||
- "{{ ansible_distribution|lower }}-{{ ansible_distribution_release }}.yml" | ||
- "{{ ansible_distribution|lower }}-{{ ansible_distribution_major_version|lower|replace('/', '_') }}.yml" | ||
- "{{ ansible_distribution|lower }}.yml" | ||
- "{{ ansible_os_family|lower }}.yml" | ||
skip: true | ||
- files: | ||
- "{{ ansible_distribution|lower }}-{{ ansible_distribution_version|lower|replace('/', '_') }}.yml" | ||
- "{{ ansible_distribution|lower }}-{{ ansible_distribution_release }}.yml" | ||
- "{{ ansible_distribution|lower }}-{{ ansible_distribution_major_version|lower|replace('/', '_') }}.yml" | ||
- "{{ ansible_distribution|lower }}.yml" | ||
- "{{ ansible_os_family|lower }}.yml" | ||
skip: true |