Update nodes in etc hosts after cluster scale (#9837)

roles/kubernetes/preinstall/defaults/main.yml

@@ -38,6 +38,8 @@ resolveconf_cloud_init_conf: /etc/resolveconf_cloud_init.conf
 populate_inventory_to_hosts_file: true
 # K8S Api FQDN will be written into /etc/hosts file.
 populate_loadbalancer_apiserver_to_hosts_file: true
+# etc_hosts_localhost_entries will be written into /etc/hosts file.
+populate_localhost_entries_to_hosts_file: true
 
 sysctl_file_path: "/etc/sysctl.d/99-sysctl.conf"
 

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

@@ -1,5 +1,7 @@
 ---
-- name: Hosts | create list from inventory
+- name: Hosts | update inventory in hosts file
+  block:
+    - name: Hosts | create list from inventory
       set_fact:
         etc_hosts_inventory_block: |-
           {% for item in (groups['k8s_cluster'] + groups['etcd']|default([]) + groups['calico_rr']|default([]))|unique -%}
@@ -14,7 +16,7 @@
       delegate_facts: yes
       run_once: yes
 
-- name: Hosts | populate inventory into hosts file
+    - name: Hosts | populate inventory into hosts file
       blockinfile:
         path: /etc/hosts
         block: "{{ hostvars.localhost.etc_hosts_inventory_block }}"
@@ -39,12 +41,14 @@
     - loadbalancer_apiserver is defined
     - loadbalancer_apiserver.address is defined
 
-- name: Hosts | Retrieve hosts file content
+- name: Hosts | Update localhost entries in hosts file
+  block:
+    - name: Hosts | Retrieve hosts file content
       slurp:
         src: /etc/hosts
       register: etc_hosts_content
 
-- name: Hosts | Extract existing entries for localhost from hosts file
+    - name: Hosts | Extract existing entries for localhost from hosts file
       set_fact:
         etc_hosts_localhosts_dict: >-
           {%- set splitted = (item | regex_replace('[ \t]+', ' ')|regex_replace('#.*$')|trim).split( ' ') -%}
@@ -54,14 +58,14 @@
         - etc_hosts_content.content is defined
         - (item is match('^::1 .*') or item is match('^127.0.0.1 .*'))
 
-- name: Hosts | Update target hosts file entries dict with required entries
+    - name: Hosts | Update target hosts file entries dict with required entries
       set_fact:
         etc_hosts_localhosts_dict_target: >-
           {%- set target_entries = (etc_hosts_localhosts_dict|default({})).get(item.key, []) | difference(item.value.get('unexpected' ,[])) -%}
           {{ etc_hosts_localhosts_dict_target|default({}) | combine({item.key: (target_entries + item.value.expected)|unique}) }}
       loop: "{{ etc_hosts_localhost_entries|dict2items }}"
 
-- name: Hosts | Update (if necessary) hosts file
+    - name: Hosts | Update (if necessary) hosts file
       lineinfile:
         dest: /etc/hosts
         line: "{{ item.key }} {{ item.value|join(' ') }}"
@@ -70,8 +74,11 @@
         backup: yes
         unsafe_writes: yes
       loop: "{{ etc_hosts_localhosts_dict_target|default({})|dict2items }}"
+  when: populate_localhost_entries_to_hosts_file
 
 # gather facts to update ansible_fqdn
 - name: Update facts
   setup:
     gather_subset: min
+  when:
+    - not dns_late

roles/kubernetes/preinstall/tasks/main.yml

@@ -74,8 +74,6 @@
     - bootstrap-os
 
 - import_tasks: 0090-etchosts.yml
-  when:
-    - not dns_late
   tags:
     - bootstrap-os
     - etchosts