airship
/
treasuremap
Code Issues Proposed changes

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
This commit is contained in:
Sergiy Markin 2024-03-29 20:45:52 +00:00
parent 6e89848cc1
commit e00640b807
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/deployment/airskiff/developer/000-prepare-k8s.sh
View File

@ -45,14 +45,6 @@ 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}"
@ -64,7 +56,7 @@ kubectl rollout status --watch --timeout=300s -n kube-system deployment/coredns
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