From 59e1638ae1228e7ecb84ddc6b90bfef1b2f22063 Mon Sep 17 00:00:00 2001
From: Bas <bas.meijer@enexis.nl>
Date: Thu, 30 Jan 2025 15:19:23 +0100
Subject: [PATCH] Bugfix/11936 - backup: "{{ leave_etc_backup_files }}"
 (#11937)

* Adding the var: leave_etc_backup_files

* Fix for #11936 - backup: "{{ leave_etc_backup_files }}"
---
 roles/kubernetes/preinstall/defaults/main.yml               | 3 ++-
 .../kubernetes/preinstall/tasks/0063-networkmanager-dns.yml | 6 +++---
 .../preinstall/tasks/0080-system-configurations.yml         | 2 +-
 roles/kubernetes/preinstall/tasks/0090-etchosts.yml         | 6 +++---
 roles/kubernetes/preinstall/tasks/0100-dhclient-hooks.yml   | 2 +-
 .../preinstall/tasks/0110-dhclient-hooks-undo.yml           | 2 +-
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/roles/kubernetes/preinstall/defaults/main.yml b/roles/kubernetes/preinstall/defaults/main.yml
index 74b962c3e..5d86f004e 100644
--- a/roles/kubernetes/preinstall/defaults/main.yml
+++ b/roles/kubernetes/preinstall/defaults/main.yml
@@ -1,7 +1,8 @@
 ---
 # Set to true to allow pre-checks to fail and continue deployment
 ignore_assert_errors: false
-
+# Set to false to disable the backup parameter, set to true to accumulate backups of config files.
+leave_etc_backup_files: true
 nameservers: []
 cloud_resolver: []
 disable_host_nameservers: false
diff --git a/roles/kubernetes/preinstall/tasks/0063-networkmanager-dns.yml b/roles/kubernetes/preinstall/tasks/0063-networkmanager-dns.yml
index d223a9468..827498956 100644
--- a/roles/kubernetes/preinstall/tasks/0063-networkmanager-dns.yml
+++ b/roles/kubernetes/preinstall/tasks/0063-networkmanager-dns.yml
@@ -6,7 +6,7 @@
     option: servers
     value: "{{ nameserverentries | join(',') }}"
     mode: '0600'
-    backup: true
+    backup: "{{ leave_etc_backup_files }}"
   when:
     - ('127.0.0.53' not in nameserverentries
        or systemd_resolved_enabled.rc != 0)
@@ -24,7 +24,7 @@
     option: searches
     value: "{{ (default_searchdomains | default([]) + searchdomains) | join(',') }}"
     mode: '0600'
-    backup: true
+    backup: "{{ leave_etc_backup_files }}"
   notify: Preinstall | update resolvconf for networkmanager
 
 - name: NetworkManager | Add DNS options to NM configuration
@@ -34,5 +34,5 @@
     option: options
     value: "ndots:{{ ndots }},timeout:{{ dns_timeout | default('2') }},attempts:{{ dns_attempts | default('2') }}"
     mode: '0600'
-    backup: true
+    backup: "{{ leave_etc_backup_files }}"
   notify: Preinstall | update resolvconf for networkmanager
diff --git a/roles/kubernetes/preinstall/tasks/0080-system-configurations.yml b/roles/kubernetes/preinstall/tasks/0080-system-configurations.yml
index 43aee1f39..2cdc32ee7 100644
--- a/roles/kubernetes/preinstall/tasks/0080-system-configurations.yml
+++ b/roles/kubernetes/preinstall/tasks/0080-system-configurations.yml
@@ -28,7 +28,7 @@
     line: "precedence ::ffff:0:0/96  100"
     state: present
     create: true
-    backup: true
+    backup: "{{ leave_etc_backup_files }}"
     mode: "0644"
   when:
     - disable_ipv6_dns
diff --git a/roles/kubernetes/preinstall/tasks/0090-etchosts.yml b/roles/kubernetes/preinstall/tasks/0090-etchosts.yml
index 8e623f8c4..1228541f3 100644
--- a/roles/kubernetes/preinstall/tasks/0090-etchosts.yml
+++ b/roles/kubernetes/preinstall/tasks/0090-etchosts.yml
@@ -25,7 +25,7 @@
     block: "{{ hostvars.localhost.etc_hosts_inventory_block }}"
     state: "{{ 'present' if populate_inventory_to_hosts_file else 'absent' }}"
     create: true
-    backup: true
+    backup: "{{ leave_etc_backup_files }}"
     unsafe_writes: true
     marker: "# Ansible inventory hosts {mark}"
     mode: "0644"
@@ -36,7 +36,7 @@
     regexp: ".*{{ apiserver_loadbalancer_domain_name }}$"
     line: "{{ loadbalancer_apiserver.address }} {{ apiserver_loadbalancer_domain_name }}"
     state: present
-    backup: true
+    backup: "{{ leave_etc_backup_files }}"
     unsafe_writes: true
   when:
     - populate_loadbalancer_apiserver_to_hosts_file
@@ -74,7 +74,7 @@
         line: "{{ item.key }} {{ item.value | join(' ') }}"
         regexp: "^{{ item.key }}.*$"
         state: present
-        backup: true
+        backup: "{{ leave_etc_backup_files }}"
         unsafe_writes: true
       loop: "{{ etc_hosts_localhosts_dict_target | default({}) | dict2items }}"
 
diff --git a/roles/kubernetes/preinstall/tasks/0100-dhclient-hooks.yml b/roles/kubernetes/preinstall/tasks/0100-dhclient-hooks.yml
index 24ae1bbc9..b9cb09c94 100644
--- a/roles/kubernetes/preinstall/tasks/0100-dhclient-hooks.yml
+++ b/roles/kubernetes/preinstall/tasks/0100-dhclient-hooks.yml
@@ -10,7 +10,7 @@
     create: true
     state: present
     insertbefore: BOF
-    backup: true
+    backup: "{{ leave_etc_backup_files }}"
     marker: "# Ansible entries {mark}"
     mode: "0644"
   notify: Preinstall | propagate resolvconf to k8s components
diff --git a/roles/kubernetes/preinstall/tasks/0110-dhclient-hooks-undo.yml b/roles/kubernetes/preinstall/tasks/0110-dhclient-hooks-undo.yml
index dd320d50a..0bc23c1be 100644
--- a/roles/kubernetes/preinstall/tasks/0110-dhclient-hooks-undo.yml
+++ b/roles/kubernetes/preinstall/tasks/0110-dhclient-hooks-undo.yml
@@ -7,7 +7,7 @@
   blockinfile:
     path: "{{ dhclientconffile }}"
     state: absent
-    backup: true
+    backup: "{{ leave_etc_backup_files }}"
     marker: "# Ansible entries {mark}"
   notify: Preinstall | propagate resolvconf to k8s components