From be631ec41057ab7fcc18d9f7eba53e2c4dfd550f Mon Sep 17 00:00:00 2001
From: Davanum Srinivas <davanum@gmail.com>
Date: Wed, 31 Mar 2021 09:35:40 -0400
Subject: [PATCH] Move from kube-dns to core-dns for local-up-cluster.sh

Still leave room for folks to run the older kube-dns if they choose to,
but it's about time we move local-up to what we tell everyone to use!

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
---
 hack/local-up-cluster.sh | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/hack/local-up-cluster.sh b/hack/local-up-cluster.sh
index f06c7e5aaeb..1d0ca889dfe 100755
--- a/hack/local-up-cluster.sh
+++ b/hack/local-up-cluster.sh
@@ -38,6 +38,8 @@ KUBELET_IMAGE=${KUBELET_IMAGE:-""}
 FAIL_SWAP_ON=${FAIL_SWAP_ON:-"false"}
 # Name of the network plugin, eg: "kubenet"
 NET_PLUGIN=${NET_PLUGIN:-""}
+# Name of the dns addon, eg: "kube-dns" or "coredns"
+DNS_ADDON=${DNS_ADDON:-"coredns"}
 # Place the config files and binaries required by NET_PLUGIN in these directory,
 # eg: "/etc/cni/net.d" for config files, and "/opt/cni/bin" for binaries.
 CNI_CONF_DIR=${CNI_CONF_DIR:-""}
@@ -921,22 +923,22 @@ EOF
     SCHEDULER_PID=$!
 }
 
-function start_kubedns {
+function start_dns_addon {
     if [[ "${ENABLE_CLUSTER_DNS}" = true ]]; then
-        cp "${KUBE_ROOT}/cluster/addons/dns/kube-dns/kube-dns.yaml.in" kube-dns.yaml
-        ${SED} -i -e "s/dns_domain/${DNS_DOMAIN}/g" kube-dns.yaml
-        ${SED} -i -e "s/dns_server/${DNS_SERVER_IP}/g" kube-dns.yaml
-        ${SED} -i -e "s/dns_memory_limit/${DNS_MEMORY_LIMIT}/g" kube-dns.yaml
+        cp "${KUBE_ROOT}/cluster/addons/dns/${DNS_ADDON}/${DNS_ADDON}.yaml.in" dns.yaml
+        ${SED} -i -e "s/dns_domain/${DNS_DOMAIN}/g" dns.yaml
+        ${SED} -i -e "s/dns_server/${DNS_SERVER_IP}/g" dns.yaml
+        ${SED} -i -e "s/dns_memory_limit/${DNS_MEMORY_LIMIT}/g" dns.yaml
         # TODO update to dns role once we have one.
-        # use kubectl to create kubedns addon
-        if ${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" --namespace=kube-system create -f kube-dns.yaml ; then
-       		echo "Kube-dns addon successfully deployed."
+        # use kubectl to create dns addon
+        if ${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" --namespace=kube-system create -f dns.yaml ; then
+            echo "${DNS_ADDON} addon successfully deployed."
         else
 		echo "Something is wrong with your DNS input"
-		cat kube-dns.yaml
+		cat dns.yaml
 		exit 1
         fi
-        rm kube-dns.yaml
+        rm dns.yaml
     fi
 }
 
@@ -1138,7 +1140,7 @@ if [[ "${START_MODE}" != "kubeletonly" ]]; then
     start_cloud_controller_manager
   fi
   start_kubescheduler
-  start_kubedns
+  start_dns_addon
   if [[ "${ENABLE_NODELOCAL_DNS:-}" == "true" ]]; then
     start_nodelocaldns
   fi