Fix README version for cni/flannel

inventory/sample/group_vars/all/offline.yml

@@ -36,9 +36,6 @@
 # [Optional] Calico with kdd: If using Calico network plugin with kdd datastore
 # calico_crds_download_url: "{{ files_repo }}/kubernetes/calico/{{ calico_version }}.tar.gz"
 
-# [Optional] Flannel: If using Falnnel network plugin
-# flannel_cni_download_url: "{{ files_repo }}/kubernetes/flannel/{{ flannel_cni_version }}/flannel-{{ image_arch }}"
-
 # [Optional] helm: only if you set helm_enabled: true
 # helm_download_url: "{{ files_repo }}/helm-{{ helm_version }}-linux-{{ image_arch }}.tar.gz"
 

remove-node.yml

@@ -21,6 +21,13 @@
         msg: "Delete nodes confirmation failed"
       when: pause_result.user_input | default('yes') != 'yes'
 
+- hosts: kube_control_plane[0]
+  gather_facts: no
+  environment: "{{ proxy_disable_env }}"
+  roles:
+    - { role: kubespray-defaults }
+    - { role: remove-node/pre-remove, tags: pre-remove }
+
 - name: Gather facts
   import_playbook: facts.yml
 
@@ -29,7 +36,6 @@
   environment: "{{ proxy_disable_env }}"
   roles:
     - { role: kubespray-defaults, when: reset_nodes|default(True)|bool }
-    - { role: remove-node/pre-remove, tags: pre-remove }
     - { role: remove-node/remove-etcd-node }
     - { role: reset, tags: reset, when: reset_nodes|default(True)|bool }
 

roles/container-engine/cri-o/tasks/main.yaml

@@ -112,7 +112,7 @@
   register: need_bootstrap_crio
   when: is_ostree
 
-- name: Install cri-o packages with ostree
+- name: Install cri-o packages with osttree
   command: "rpm-ostree install {{ crio_packages|join(' ') }}"
   when:
     - is_ostree

roles/kubernetes/preinstall/defaults/main.yml

@@ -60,3 +60,10 @@ pkg_install_retries: 4
 
 # Check if access_ip responds to ping. Set false if your firewall blocks ICMP.
 ping_access_ip: true
+
+apiserver_loadbalancer_domain_name_host: |-
+  {% if inventory_hostname in groups['kube_control_plane'] -%}
+      127.0.0.1
+  {%- else -%}
+      {{ loadbalancer_apiserver.address }}
+  {%- endif %}

roles/kubernetes/preinstall/tasks/0090-etchosts.yml

@@ -29,7 +29,7 @@
   lineinfile:
     dest: /etc/hosts
     regexp: ".*{{ apiserver_loadbalancer_domain_name }}$"
-    line: "{{ loadbalancer_apiserver.address }} {{ apiserver_loadbalancer_domain_name }}"
+    line: "{{ apiserver_loadbalancer_domain_name_host }} {{ apiserver_loadbalancer_domain_name }}"
     state: present
     backup: yes
     unsafe_writes: yes

roles/kubernetes/preinstall/tasks/0120-growpart-azure-centos-7.yml

@@ -7,10 +7,6 @@
     name: cloud-utils-growpart
     state: present
 
-- name: Gather mounts facts
-  setup:
-    gather_subset: 'mounts'
-
 - name: Search root filesystem device
   vars:
     query: "[?mount=='/'].device"

roles/kubernetes/preinstall/templates/resolved.conf.j2

@@ -1,5 +1,5 @@
 [Resolve]
-DNS={{ ([nodelocaldns_ip] if enable_nodelocaldns else coredns_server )| list | join(' ') }}
+DNS={{ (nodelocaldns_ip |default(coredns_server) )| list | join(' ') }}
 FallbackDNS={{ ( nameservers|d([]) + cloud_resolver|d([])) | unique | join(' ') }}
 Domains={{ ([ 'default.svc.' + dns_domain, 'svc.' + dns_domain ] + searchdomains|default([])) | join(' ') }}
 #LLMNR=no

roles/remove-node/pre-remove/tasks/main.yml

@@ -14,12 +14,14 @@
       --ignore-daemonsets
       --grace-period {{ drain_grace_period }}
       --timeout {{ drain_timeout }}
-      --delete-emptydir-data {{ kube_override_hostname|default(inventory_hostname) }}
+      --delete-emptydir-data {{ hostvars[item]['kube_override_hostname']|default(item) }}
+  loop: "{{ node.split(',') | default(groups['kube_node']) }}"
   # ignore servers that are not nodes
-  when: kube_override_hostname|default(inventory_hostname) in nodes.stdout_lines
+  when: hostvars[item]['kube_override_hostname']|default(item) in nodes.stdout_lines
   register: result
   failed_when: result.rc != 0 and not allow_ungraceful_removal
   delegate_to: "{{ groups['kube_control_plane']|first }}"
+  run_once: true
   until: result.rc == 0 or allow_ungraceful_removal
   retries: "{{ drain_retries }}"
   delay: "{{ drain_retry_delay_seconds }}"

tests/common/_docker_hub_registry_mirror.yml

@@ -24,8 +24,6 @@ crio_registries_mirrors:
 netcheck_agent_image_repo: "{{ quay_image_repo }}/kubespray/k8s-netchecker-agent"
 netcheck_server_image_repo: "{{ quay_image_repo }}/kubespray/k8s-netchecker-server"
 
-nginx_image_repo: "{{ quay_image_repo }}/kubespray/nginx"
-
 # Kubespray settings for tests
 deploy_netchecker: true
 dns_min_replicas: 1