From 61a82f9f9792b1080c5ce534bc6cf758c38e3893 Mon Sep 17 00:00:00 2001
From: Sergiy Markin <smarkin@mirantis.com>
Date: Fri, 29 Mar 2024 20:45:52 +0000
Subject: [PATCH] Remove temp DNS resolver fix

This PS adopts DNS resolver fix from this osh-infra project:

https: //review.opendev.org/c/openstack/openstack-helm-infra/+/914686
Change-Id: Ie4a27422dbc9c71681c44635547f8b3a89aa6e45
---
 .../deployment/airskiff/developer/000-prepare-k8s.sh  | 11 ++---------
 tools/gate/playbooks/prepare-hosts.yaml               |  4 ++++
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/tools/deployment/airskiff/developer/000-prepare-k8s.sh b/tools/deployment/airskiff/developer/000-prepare-k8s.sh
index 0d68e9569..4af138296 100755
--- a/tools/deployment/airskiff/developer/000-prepare-k8s.sh
+++ b/tools/deployment/airskiff/developer/000-prepare-k8s.sh
@@ -45,26 +45,19 @@ EOF
 kubectl apply -f /tmp/${NAMESPACE}-ns.yaml
 done
 
-# DNS resolve temp fix
-cat << EOF | sudo tee /etc/resolv.conf > /dev/null
-nameserver 10.96.0.10
-nameserver 8.8.8.8
-nameserver 8.8.4.4
-search svc.cluster.local cluster.local
-options ndots:5 timeout:1 attempts:1
-EOF
 
 # CoreDNS version upgrade
 kubectl set image deployment coredns -n kube-system "coredns=registry.k8s.io/coredns/coredns:${COREDNS_VERSION}"
 kubectl rollout restart -n kube-system deployment/coredns
 kubectl rollout status --watch --timeout=300s -n kube-system deployment/coredns
 
+while true; do sleep 10; done
 
 # Add control-plane.minikube.internal host resord into CodeDNS
 PATCH=$(mktemp)
 HOSTIP=$(hostname -I| awk '{print $1}')
 kubectl get configmap coredns -n kube-system -o json | jq -r "{data: .data}"  > "${PATCH}"
-sed -i "s;forward . /etc/resolv.conf {\\\n       max_concurrent 1000\\\n    }\\\n;forward . /etc/resolv.conf {\\\n    }\\\n    hosts {\\\n       $HOSTIP control-plane.minikube.internal\\\n       fallthrough\\\n    }\\\n;" "${PATCH}"
+sed -i "s;forward . 8.8.8.8 {\\\n       max_concurrent 1000\\\n    }\\\n;forward . 8.8.8.8 {\\\n    }\\\n    hosts {\\\n       $HOSTIP control-plane.minikube.internal\\\n       fallthrough\\\n    }\\\n;" "${PATCH}"
 kubectl patch configmap coredns -n kube-system --patch-file "${PATCH}"
 rm -f "${PATCH}"
 kubectl rollout restart -n kube-system deployment/coredns
diff --git a/tools/gate/playbooks/prepare-hosts.yaml b/tools/gate/playbooks/prepare-hosts.yaml
index c64aa0d65..0246574c2 100644
--- a/tools/gate/playbooks/prepare-hosts.yaml
+++ b/tools/gate/playbooks/prepare-hosts.yaml
@@ -14,4 +14,8 @@
 - hosts: all
   roles:
     - start-zuul-console
+    - role: add-authorized-keys
+      public_keys:
+        - public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDA7eM8WFJrqQmki8rR0O3QBHyl8xq42jb1RduwuRwjWoGYJI5cX7Fx+7VR4A9ITCoiqxKS8DMfgKbt5jKC6SmvMALULZsnYlthB34KywurgxsW6fgp68DHWQ7J4CCBhoIpl0W3JW7s6b0vHLhab59r0E+AYemBVuWUqbFEy8nDAHcQv1S/2o1udhmljIN7c2ogO4KAJ7Lge0BoIP9ps4u6AVwyQZixp4anU9DHGNA/UQj4M5UyuALj5buEAuATBe9Vqj4sOvZjObPJAGPUrNRrGEWAFk+lSZHRzKXo0eeWtPqoh5UN9UDb5Pocg1krncMIZwjHKovlD1z/O1y91aY5LM1wxm/7aaIiX8eCihyVZaOuDCLF7WDT2SMs7ABcotX2MDtVQTrNNV3MmMAScFNDflzPKszd7cdjLl6PBq8bvPxmCkLmnitPTGOoh9d8i+JlbINvgx1pguYrpeciIyreCO1rjTW3MgB0tyoMEa31V+7HrauBMeNnE68YTqLTIB0= smarkin@mirantis.com
+
 ...