From cfed816a9a1910b334fc4c8c4c7d98b2ed13780e Mon Sep 17 00:00:00 2001
From: Vladimir Kozhukalov <kozhukalov@gmail.com>
Date: Wed, 20 Mar 2024 15:29:17 -0500
Subject: [PATCH] Fix coredns resolver

Forward requests for unknown names to 8.8.8.8

NOTE: Temporarily disable DPDK job which turned to
be incompatible with this PR
https://review.opendev.org/c/openstack/openstack-helm/+/914399
It wasn't tested with the DPDK job.

Change-Id: I936fb1032a736f7b09ad50b749d37095cce4c392
---
 roles/deploy-env/defaults/main.yaml          |  2 +
 roles/deploy-env/tasks/coredns_resolver.yaml | 43 ++++++++++++++++----
 roles/deploy-env/tasks/main.yaml             |  1 +
 zuul.d/project.yaml                          |  2 +-
 4 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/roles/deploy-env/defaults/main.yaml b/roles/deploy-env/defaults/main.yaml
index ba637dd2d..986803a58 100644
--- a/roles/deploy-env/defaults/main.yaml
+++ b/roles/deploy-env/defaults/main.yaml
@@ -36,6 +36,8 @@ loopback_device: /dev/loop100
 loopback_image: /var/lib/openstack-helm/ceph-loop.img
 loopback_image_size: 12G
 
+coredns_resolver_setup: true
+
 metallb_setup: false
 metallb_pool_cidr: "172.24.128.0/24"
 metallb_openstack_endpoint_cidr: "172.24.128.100/24"
diff --git a/roles/deploy-env/tasks/coredns_resolver.yaml b/roles/deploy-env/tasks/coredns_resolver.yaml
index e540369ae..52456990f 100644
--- a/roles/deploy-env/tasks/coredns_resolver.yaml
+++ b/roles/deploy-env/tasks/coredns_resolver.yaml
@@ -14,16 +14,41 @@
 - name: Enable recursive queries for coredns
   become: false
   shell: |
-    PATCH=$(mktemp)
-    kubectl get configmap coredns -n kube-system -o json | jq -r "{data: .data}"  | sed 's/ready\\n/header \{\\n        response set ra\\n    \}\\n    ready\\n/g' > "${PATCH}"
-    kubectl patch configmap coredns -n kube-system --patch-file "${PATCH}"
-    kubectl set image deployment coredns -n kube-system "coredns=registry.k8s.io/coredns/coredns:v1.9.4"
+    tee > /tmp/coredns_configmap.yaml <<EOF
+    apiVersion: v1
+    kind: ConfigMap
+    metadata:
+      name: coredns
+      namespace: kube-system
+    data:
+      Corefile: |
+        .:53 {
+            errors
+            health {
+              lameduck 5s
+            }
+            header {
+                response set ra
+            }
+            ready
+            kubernetes cluster.local in-addr.arpa ip6.arpa {
+              pods insecure
+              fallthrough in-addr.arpa ip6.arpa
+              ttl 30
+            }
+            prometheus :9153
+            forward . 8.8.8.8 {
+              max_concurrent 1000
+            }
+            cache 30
+            loop
+            reload
+            loadbalance
+        }
+    EOF
+    kubectl apply -f /tmp/coredns_configmap.yaml
     kubectl rollout restart -n kube-system deployment/coredns
-    sleep 30
-    kubectl -n kube-system wait --timeout=240s --for=condition=Ready pods -l k8s-app=kube-dns
-    rm -f "${PATCH}"
-  args:
-    executable: /bin/bash
+    kubectl rollout status -n kube-system deployment/coredns
   when: inventory_hostname in (groups['primary'] | default([]))
 
 - name: Use coredns as default DNS resolver
diff --git a/roles/deploy-env/tasks/main.yaml b/roles/deploy-env/tasks/main.yaml
index 397c38dbf..b1c9d5502 100644
--- a/roles/deploy-env/tasks/main.yaml
+++ b/roles/deploy-env/tasks/main.yaml
@@ -55,6 +55,7 @@
 - name: Include coredns resolver tasks
   include_tasks:
     file: coredns_resolver.yaml
+  when: coredns_resolver_setup
 
 - name: Include Openstack provider gateway tasks
   include_tasks:
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index f5cc6c400..c2ccb3b2f 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -33,7 +33,7 @@
         - openstack-helm-infra-compute-kit-2023-2-ubuntu_jammy
         - openstack-helm-infra-cinder-2023-2-ubuntu_jammy
         - openstack-helm-infra-tls-2023-1-ubuntu_focal
-        - openstack-helm-infra-compute-kit-dpdk-2023.2-ubuntu_jammy
+        # - openstack-helm-infra-compute-kit-dpdk-2023.2-ubuntu_jammy
     gate:
       jobs:
         - openstack-helm-lint