fix code

jwklijnsma · Jan 25, 2025 · c92f5f7 · c92f5f7
1 parent 4ae8c2a
commit c92f5f7
Showing 1 changed file with 0 additions and 61 deletions.
diff --git a/roles/upgrade/pre-upgrade/tasks/main.yml b/roles/upgrade/pre-upgrade/tasks/main.yml
@@ -35,64 +35,3 @@
   delegate_to: "{{ groups['kube_control_plane'][0] }}"
   failed_when: false
   changed_when: false
-
-- name: Set if node needs cordoning
-  set_fact:
-    needs_cordoning: "{{ (kubectl_node_ready.stdout == 'True' and not kubectl_node_schedulable.stdout) or upgrade_node_always_cordon }}"
-
-- name: Node draining
-  delegate_to: "{{ groups['kube_control_plane'][0] }}"
-  when:
-    - needs_cordoning
-  block:
-    - name: Cordon node
-      command: "{{ kubectl }} cordon {{ kube_override_hostname | default(inventory_hostname) }}"
-      delegate_to: "{{ groups['kube_control_plane'][0] }}"
-      changed_when: true
-
-    - name: Drain node
-      command: >-
-        {{ kubectl }} drain
-        --force
-        --ignore-daemonsets
-        --grace-period {{ drain_grace_period }}
-        --timeout {{ drain_timeout }}
-        --delete-emptydir-data {{ kube_override_hostname | default(inventory_hostname) }}
-        {% if drain_pod_selector %}--pod-selector '{{ drain_pod_selector }}'{% endif %}
-      when: drain_nodes
-      register: result
-      failed_when:
-        - result.rc != 0
-        - not drain_fallback_enabled
-      until: result.rc == 0
-      retries: "{{ drain_retries }}"
-      delay: "{{ drain_retry_delay_seconds }}"
-
-    - name: Drain node - fallback with disabled eviction
-      when:
-        - drain_nodes
-        - drain_fallback_enabled
-        - result.rc != 0
-      command: >-
-        {{ kubectl }} drain
-        --force
-        --ignore-daemonsets
-        --grace-period {{ drain_fallback_grace_period }}
-        --timeout {{ drain_fallback_timeout }}
-        --delete-emptydir-data {{ kube_override_hostname | default(inventory_hostname) }}
-        {% if drain_pod_selector %}--pod-selector '{{ drain_pod_selector }}'{% endif %}
-        --disable-eviction
-      register: drain_fallback_result
-      until: drain_fallback_result.rc == 0
-      retries: "{{ drain_fallback_retries }}"
-      delay: "{{ drain_fallback_retry_delay_seconds }}"
-      changed_when: drain_fallback_result.rc == 0
-
-  rescue:
-    - name: Set node back to schedulable
-      command: "{{ kubectl }} uncordon {{ kube_override_hostname | default(inventory_hostname) }}"
-      when: upgrade_node_uncordon_after_drain_failure
-    - name: Fail after rescue
-      fail:
-        msg: "Failed to drain node {{ kube_override_hostname | default(inventory_hostname) }}"
-      when: upgrade_node_fail_if_drain_fails