From e570e2e736398500801d1f6fe3a0f462a7d8e061 Mon Sep 17 00:00:00 2001
From: Florian Ruynat <florian234@hotmail.com>
Date: Fri, 7 Feb 2020 11:19:43 +0100
Subject: [PATCH] Remove last rkt references (#5606)
---
roles/kubernetes/node/tasks/facts.yml | 4 ++--
roles/kubernetes/node/tasks/pre_upgrade.yml | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/roles/kubernetes/node/tasks/facts.yml b/roles/kubernetes/node/tasks/facts.yml
index 6558a8319..a879651d7 100644
--- a/roles/kubernetes/node/tasks/facts.yml
+++ b/roles/kubernetes/node/tasks/facts.yml
@@ -3,7 +3,7 @@
shell: "docker info | grep 'Cgroup Driver' | awk -F': ' '{ print $2; }'"
register: docker_cgroup_driver_result
changed_when: false
- when: container_manager in ['crio', 'docker', 'rkt']
+ when: container_manager in ['crio', 'docker']
- name: set standalone_kubelet fact
set_fact:
@@ -19,7 +19,7 @@
- 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', 'rkt']
+ when: container_manager in ['crio', 'docker']
- name: os specific vars
include_vars: "{{ item }}"
diff --git a/roles/kubernetes/node/tasks/pre_upgrade.yml b/roles/kubernetes/node/tasks/pre_upgrade.yml
index 846e5e46b..78a39567c 100644
--- a/roles/kubernetes/node/tasks/pre_upgrade.yml
+++ b/roles/kubernetes/node/tasks/pre_upgrade.yml
@@ -1,7 +1,7 @@
---
- name: "Pre-upgrade | check if kubelet container exists"
shell: >-
- {% if container_manager in ['crio', 'docker', 'rkt'] %}
+ {% if container_manager in ['crio', 'docker'] %}
docker ps -af name=kubelet | grep kubelet
{% elif container_manager == 'containerd' %}
crictl ps --all --name kubelet | grep kubelet
@@ -12,7 +12,7 @@
- name: "Pre-upgrade | copy /var/lib/cni from kubelet"
command: >-
- {% if container_manager in ['crio', 'docker', 'rkt'] %}
+ {% if container_manager in ['crio', 'docker'] %}
docker cp kubelet:/var/lib/cni /var/lib/cni
{% 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/'
@@ -30,7 +30,7 @@
- name: "Pre-upgrade | ensure kubelet container is removed if using host deployment"
shell: >-
- {% if container_manager in ['crio', 'docker', 'rkt'] %}
+ {% if container_manager in ['crio', 'docker'] %}
docker rm -fv kubelet
{% elif container_manager == 'containerd' %}
crictl stop kubelet && crictl rm kubelet
--
GitLab