github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 19:01:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #100706 from dims/move-from-kube-dns-to-core-dns-for-local-up-cluster.sh

Browse Source 
Move from kube-dns to core-dns for local-up-cluster.sh
This commit is contained in:
Kubernetes Prow Robot 2021-04-09 05:20:29 -07:00 committed by GitHub
commit cf9d74439b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hack/local-up-cluster.sh
View File

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