From 30b4a880489e99bf0c143b5264b9b71c8c052210 Mon Sep 17 00:00:00 2001
From: Chad Zimmerman <54250848+PrymalInstynct@users.noreply.github.com>
Date: Wed, 22 Nov 2023 17:46:26 -0700
Subject: [PATCH] Update cluster-rollout-update.yaml.j2 (#1035)

---
 .../playbooks/cluster-rollout-update.yaml.j2  | 37 +++++++------------
 1 file changed, 14 insertions(+), 23 deletions(-)

diff --git a/bootstrap/templates/ansible/playbooks/cluster-rollout-update.yaml.j2 b/bootstrap/templates/ansible/playbooks/cluster-rollout-update.yaml.j2
index 086c7dce..9ba80f34 100644
--- a/bootstrap/templates/ansible/playbooks/cluster-rollout-update.yaml.j2
+++ b/bootstrap/templates/ansible/playbooks/cluster-rollout-update.yaml.j2
@@ -33,30 +33,21 @@
           delegate_to: "{% raw %}{{ groups['master'][0] }}{% endraw %}"
 
         - name: Drain
-          ansible.builtin.command: "kubectl drain --pod-selector='app!=rook-ceph-osd,app!=csi-attacher,app!=csi-provisioner' --ignore-daemonsets --delete-emptydir-data --force --grace-period=300 {% raw %}{{ inventory_hostname }}{% endraw %}"
+          kubernetes.core.k8s_drain:
+            kubeconfig: /etc/rancher/k3s/k3s.yaml
+            state: drain
+            delete_options:
+              delete_emptydir_data: true
+              ignore_daemonsets: true
+              terminate_grace_period: 600
+              wait_timeout: 900
+            pod_selectors:
+             # Rook Ceph
+             - app!=rook-ceph-osd
+             # Longhorn
+             - app!=csi-attacher
+             - app!=csi-provisioner
           delegate_to: "{% raw %}{{ groups['master'][0] }}{% endraw %}"
-          changed_when: false
-    
-        ### pod_selectors feature in upcoming kubernetes.core 2.5.0 ###
-        # - name: Drain
-        #   kubernetes.core.k8s_drain:
-        #     name: "{% raw %}{{ inventory_hostname }}{% endraw %}"
-        #     kubeconfig: /etc/rancher/k3s/k3s.yaml
-        #     state: drain
-        #     delete_options:
-        #       delete_emptydir_data: true
-        #       ignore_daemonsets: true
-        #       terminate_grace_period: 600
-        #       wait_timeout: 900
-        #       force: true
-        #     pod_selectors:
-        #       # Rook Ceph
-        #      - app!=rook-ceph-osd
-        #       # Longhorn
-        #      - app!=csi-attacher
-        #       # Longhorn
-        #      - app!=csi-provisioner
-        #   delegate_to: "{% raw %}{{ groups['master'][0] }}{% endraw %}"
 
         - name: Update
           ansible.builtin.apt: