Remove last rkt references (kubernetes-sigs#5606)

Flowkap · Feb 7, 2020 · e570e2e · e570e2e
1 parent 16fd2e5
commit e570e2e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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