Support ignoring preflight check on upgrade

enix · Jan 22, 2024 · 305ac5e · 305ac5e
1 parent 02b2ad9
commit 305ac5e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/roles/common_vars/defaults/main.yml b/roles/common_vars/defaults/main.yml
@@ -1,5 +1,6 @@
 ---
 enable_kubeadm_patches: true
+kubeadm_ignore_preflight_errors: []
 kubeadm_patch_dir: /etc/kubernetes/patches
 kube_cp_group: kube_control_plane
 kube_worker_group: kube_workers

diff --git a/roles/init_cp/defaults/main.yml b/roles/init_cp/defaults/main.yml
@@ -1,4 +1,3 @@
 ---
-kubeadm_ignore_preflight_errors: []
 kubeadm_api_advertise_cidr: ''
 kubeadm_node_ip_cidr: ''
diff --git a/roles/upgrade_cp/tasks/main.yml b/roles/upgrade_cp/tasks/main.yml
@@ -1,6 +1,10 @@
 ---
 - name: 'Plan upgrade'
-  command: kubeadm upgrade plan {{ kubeadm_version.version.split( '-' )|first }}
+  command: >-
+    kubeadm upgrade plan {{ kubeadm_version.version.split( '-' )|first }}
+    {% for error in kubeadm_ignore_preflight_errors %}
+    --ignore-preflight-errors={{ error }}
+    {% endfor %}
   environment:
     KUBECONFIG: '/etc/kubernetes/admin.conf'
   register: plan_upgrade
@@ -12,7 +16,11 @@
               stdout=plan_upgrade.stdout_lines) }}
 
 - name: 'Apply upgrade'
-  command: kubeadm upgrade apply {{ kubeadm_version.version.split( '-' )|first }} -y
+  command: >-
+    kubeadm upgrade apply {{ kubeadm_version.version.split( '-' )|first }} -y
+    {% for error in kubeadm_ignore_preflight_errors %}
+    --ignore-preflight-errors={{ error }}
+    {% endfor %}
   register: apply_upgrade
 
 - name: 'Display result of "kubectl upgrade apply"'

diff --git a/roles/upgrade_nodes/tasks/main.yml b/roles/upgrade_nodes/tasks/main.yml
@@ -16,6 +16,9 @@
         {{ kubeadm_patch_dir }}
       {%- endif %}
     {%- endif -%}
+    {% for error in kubeadm_ignore_preflight_errors %}
+    --ignore-preflight-errors={{ error }}
+    {% endfor %}
   register: upgrade_node
 
 - name: 'Display result of "kubeadm upgrade node"'