From 85f15900a4a01a39778c75df277e6909aba64e8d Mon Sep 17 00:00:00 2001
From: Max Gautier <mg@max.gautier.name>
Date: Thu, 7 Dec 2023 12:54:15 +0100
Subject: [PATCH] Remove unneeded workaround for removing kubeadm DNS (#10695)

Kubeadm dns phase is correctly skipped.
This was a workaround for kubernetes/kubeadm#1557, which was actually
not a bug ; the correct fix was #4867
---
 .../ansible/tasks/cleanup_dns.yml             | 44 -------------------
 roles/kubernetes-apps/ansible/tasks/main.yml  |  9 ----
 2 files changed, 53 deletions(-)
 delete mode 100644 roles/kubernetes-apps/ansible/tasks/cleanup_dns.yml

diff --git a/roles/kubernetes-apps/ansible/tasks/cleanup_dns.yml b/roles/kubernetes-apps/ansible/tasks/cleanup_dns.yml
deleted file mode 100644
index fef52461c..000000000
--- a/roles/kubernetes-apps/ansible/tasks/cleanup_dns.yml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-- name: Kubernetes Apps | Register coredns deployment annotation `createdby`
-  command: "{{ kubectl }} get deploy -n kube-system coredns -o jsonpath='{ .spec.template.metadata.annotations.createdby }'"
-  register: createdby_annotation_deploy
-  changed_when: false
-  check_mode: false
-  ignore_errors: true  # noqa ignore-errors
-  when:
-    - dns_mode in ['coredns', 'coredns_dual']
-    - inventory_hostname == groups['kube_control_plane'][0]
-
-- name: Kubernetes Apps | Register coredns service annotation `createdby`
-  command: "{{ kubectl }} get svc -n kube-system coredns -o jsonpath='{ .metadata.annotations.createdby }'"
-  register: createdby_annotation_svc
-  changed_when: false
-  check_mode: false
-  ignore_errors: true  # noqa ignore-errors
-  when:
-    - dns_mode in ['coredns', 'coredns_dual']
-    - inventory_hostname == groups['kube_control_plane'][0]
-
-- name: Kubernetes Apps | Delete kubeadm CoreDNS
-  kube:
-    name: "coredns"
-    namespace: "kube-system"
-    kubectl: "{{ bin_dir }}/kubectl"
-    resource: "deploy"
-    state: absent
-  when:
-    - dns_mode in ['coredns', 'coredns_dual']
-    - inventory_hostname == groups['kube_control_plane'][0]
-    - createdby_annotation_deploy.stdout != 'kubespray'
-
-- name: Kubernetes Apps | Delete kubeadm Kube-DNS service
-  kube:
-    name: "kube-dns"
-    namespace: "kube-system"
-    kubectl: "{{ bin_dir }}/kubectl"
-    resource: "svc"
-    state: absent
-  when:
-    - dns_mode in ['coredns', 'coredns_dual']
-    - inventory_hostname == groups['kube_control_plane'][0]
-    - createdby_annotation_svc.stdout != 'kubespray'
diff --git a/roles/kubernetes-apps/ansible/tasks/main.yml b/roles/kubernetes-apps/ansible/tasks/main.yml
index 4a0180ede..e3d82f106 100644
--- a/roles/kubernetes-apps/ansible/tasks/main.yml
+++ b/roles/kubernetes-apps/ansible/tasks/main.yml
@@ -11,15 +11,6 @@
   delay: 1
   when: inventory_hostname == groups['kube_control_plane'][0]
 
-- name: Kubernetes Apps | Cleanup DNS
-  import_tasks: cleanup_dns.yml
-  when:
-    - inventory_hostname == groups['kube_control_plane'][0]
-  tags:
-    - upgrade
-    - coredns
-    - nodelocaldns
-
 - name: Kubernetes Apps | CoreDNS
   import_tasks: "coredns.yml"
   when: