C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove last rkt references (#5606)

Browse source
This commit is contained in:
Florian Ruynat 2020-02-07 11:19:43 +01:00 committed by GitHub
parent 16fd2e5d68
commit e570e2e736
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,7 @@
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', 'rkt'] when: container_manager in ['crio', 'docker']
- name: set standalone_kubelet fact - name: set standalone_kubelet fact
set_fact: set_fact:
@ -19,7 +19,7 @@
- name: set kubelet_cgroup_driver_detected fact for other engines - name: set kubelet_cgroup_driver_detected fact for other engines
set_fact: set_fact:
kubelet_cgroup_driver_detected: "{{ docker_cgroup_driver_result.stdout }}" kubelet_cgroup_driver_detected: "{{ docker_cgroup_driver_result.stdout }}"
when: container_manager in ['crio', 'docker', 'rkt'] when: container_manager in ['crio', 'docker']
- name: os specific vars - name: os specific vars
include_vars: "{{ item }}" include_vars: "{{ item }}"

6
roles/kubernetes/node/tasks/pre_upgrade.yml
View file

@ -1,7 +1,7 @@
--- ---
- name: "Pre-upgrade | check if kubelet container exists" - name: "Pre-upgrade | check if kubelet container exists"
shell: >- shell: >-
{% if container_manager in ['crio', 'docker', 'rkt'] %} {% if container_manager in ['crio', 'docker'] %}
docker ps -af name=kubelet | grep kubelet docker ps -af name=kubelet | grep kubelet
{% elif container_manager == 'containerd' %} {% elif container_manager == 'containerd' %}
crictl ps --all --name kubelet | grep kubelet crictl ps --all --name kubelet | grep kubelet
@ -12,7 +12,7 @@
- name: "Pre-upgrade | copy /var/lib/cni from kubelet" - name: "Pre-upgrade | copy /var/lib/cni from kubelet"
command: >- command: >-
{% if container_manager in ['crio', 'docker', 'rkt'] %} {% if container_manager in ['crio', 'docker'] %}
docker cp kubelet:/var/lib/cni /var/lib/cni docker cp kubelet:/var/lib/cni /var/lib/cni
{% elif container_manager == 'containerd' %} {% elif container_manager == 'containerd' %}
ctr run --rm --mount type=bind,src=/var/lib/cni,dst=/cnilibdir,options=rbind:rw kubelet kubelet-tmp sh -c 'cp /var/lib/cni/* /cnilibdir/' ctr run --rm --mount type=bind,src=/var/lib/cni,dst=/cnilibdir,options=rbind:rw kubelet kubelet-tmp sh -c 'cp /var/lib/cni/* /cnilibdir/'
@ -30,7 +30,7 @@
- name: "Pre-upgrade | ensure kubelet container is removed if using host deployment" - name: "Pre-upgrade | ensure kubelet container is removed if using host deployment"
shell: >- shell: >-
{% if container_manager in ['crio', 'docker', 'rkt'] %} {% if container_manager in ['crio', 'docker'] %}
docker rm -fv kubelet docker rm -fv kubelet
{% elif container_manager == 'containerd' %} {% elif container_manager == 'containerd' %}
crictl stop kubelet && crictl rm kubelet crictl stop kubelet && crictl rm kubelet