diff --git a/cluster/centos/config-default.sh b/cluster/centos/config-default.sh index 2c3b50c9978..61d823f5728 100755 --- a/cluster/centos/config-default.sh +++ b/cluster/centos/config-default.sh @@ -42,7 +42,6 @@ ENABLE_CLUSTER_DNS="${KUBE_ENABLE_CLUSTER_DNS:-true}" # DNS_SERVER_IP must be a IP in SERVICE_CLUSTER_IP_RANGE DNS_SERVER_IP=${DNS_SERVER_IP:-"192.168.3.100"} DNS_DOMAIN=${DNS_DOMAIN:-"cluster.local"} -DNS_REPLICAS=${DNS_REPLICAS:-1} # Optional: Install Kubernetes UI ENABLE_CLUSTER_UI="${KUBE_ENABLE_CLUSTER_UI:-true}" diff --git a/cluster/centos/deployAddons.sh b/cluster/centos/deployAddons.sh index 4f206a9ece5..cf5ae6868e6 100755 --- a/cluster/centos/deployAddons.sh +++ b/cluster/centos/deployAddons.sh @@ -26,19 +26,19 @@ export KUBE_CONFIG_FILE=${KUBE_CONFIG_FILE:-${KUBE_ROOT}/cluster/centos/config-d function deploy_dns { echo "Deploying DNS on Kubernetes" - sed -e "s/\\\$DNS_REPLICAS/${DNS_REPLICAS}/g;s/\\\$DNS_DOMAIN/${DNS_DOMAIN}/g;" "${KUBE_ROOT}/cluster/addons/dns/skydns-rc.yaml.sed" > skydns-rc.yaml - sed -e "s/\\\$DNS_SERVER_IP/${DNS_SERVER_IP}/g" "${KUBE_ROOT}/cluster/addons/dns/skydns-svc.yaml.sed" > skydns-svc.yaml + sed -e "s/\\\$DNS_DOMAIN/${DNS_DOMAIN}/g" "${KUBE_ROOT}/cluster/addons/dns/kubedns-controller.yaml.sed" > kubedns-controller.yaml + sed -e "s/\\\$DNS_SERVER_IP/${DNS_SERVER_IP}/g" "${KUBE_ROOT}/cluster/addons/dns/kubedns-svc.yaml.sed" > kubedns-svc.yaml KUBEDNS=`eval "${KUBECTL} get services --namespace=kube-system | grep kube-dns | cat"` if [ ! "$KUBEDNS" ]; then - # use kubectl to create skydns rc and service - ${KUBECTL} --namespace=kube-system create -f skydns-rc.yaml - ${KUBECTL} --namespace=kube-system create -f skydns-svc.yaml + # use kubectl to create kube-dns deployment and service + ${KUBECTL} --namespace=kube-system create -f kubedns-controller.yaml + ${KUBECTL} --namespace=kube-system create -f kubedns-svc.yaml - echo "Kube-dns rc and service is successfully deployed." + echo "Kube-dns deployment and service is successfully deployed." else - echo "Kube-dns rc and service is already deployed. Skipping." + echo "Kube-dns deployment and service is already deployed. Skipping." fi echo diff --git a/hack/local-up-cluster.sh b/hack/local-up-cluster.sh index 30aa9f627e9..b0ca0ce3f8a 100755 --- a/hack/local-up-cluster.sh +++ b/hack/local-up-cluster.sh @@ -49,7 +49,6 @@ CGROUP_DRIVER=${CGROUP_DRIVER:-""} ENABLE_CLUSTER_DNS=${KUBE_ENABLE_CLUSTER_DNS:-false} DNS_SERVER_IP=${KUBE_DNS_SERVER_IP:-10.0.0.10} DNS_DOMAIN=${KUBE_DNS_NAME:-"cluster.local"} -DNS_REPLICAS=${KUBE_DNS_REPLICAS:-1} KUBECTL=${KUBECTL:-cluster/kubectl.sh} WAIT_FOR_URL_API_SERVER=${WAIT_FOR_URL_API_SERVER:-10} ENABLE_DAEMON=${ENABLE_DAEMON:-false} @@ -611,29 +610,29 @@ function start_kubeproxy { function start_kubedns { if [[ "${ENABLE_CLUSTER_DNS}" = true ]]; then echo "Creating kube-system namespace" - sed -e "s/{{ pillar\['dns_replicas'\] }}/${DNS_REPLICAS}/g;s/{{ pillar\['dns_domain'\] }}/${DNS_DOMAIN}/g;" "${KUBE_ROOT}/cluster/addons/dns/kubedns-controller.yaml.in" >| kubedns-rc.yaml + sed -e "s/{{ pillar\['dns_domain'\] }}/${DNS_DOMAIN}/g" "${KUBE_ROOT}/cluster/addons/dns/kubedns-controller.yaml.in" >| kubedns-deployment.yaml if [[ "${FEDERATION:-}" == "true" ]]; then FEDERATIONS_DOMAIN_MAP="${FEDERATIONS_DOMAIN_MAP:-}" if [[ -z "${FEDERATIONS_DOMAIN_MAP}" && -n "${FEDERATION_NAME:-}" && -n "${DNS_ZONE_NAME:-}" ]]; then FEDERATIONS_DOMAIN_MAP="${FEDERATION_NAME}=${DNS_ZONE_NAME}" fi if [[ -n "${FEDERATIONS_DOMAIN_MAP}" ]]; then - sed -i -e "s/{{ pillar\['federations_domain_map'\] }}/- --federations=${FEDERATIONS_DOMAIN_MAP}/g" kubedns-rc.yaml + sed -i -e "s/{{ pillar\['federations_domain_map'\] }}/- --federations=${FEDERATIONS_DOMAIN_MAP}/g" kubedns-deployment.yaml else - sed -i -e "/{{ pillar\['federations_domain_map'\] }}/d" kubedns-rc.yaml + sed -i -e "/{{ pillar\['federations_domain_map'\] }}/d" kubedns-deployment.yaml fi else - sed -i -e "/{{ pillar\['federations_domain_map'\] }}/d" kubedns-rc.yaml + sed -i -e "/{{ pillar\['federations_domain_map'\] }}/d" kubedns-deployment.yaml fi sed -e "s/{{ pillar\['dns_server'\] }}/${DNS_SERVER_IP}/g" "${KUBE_ROOT}/cluster/addons/dns/kubedns-svc.yaml.in" >| kubedns-svc.yaml # TODO update to dns role once we have one. ${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" create clusterrolebinding system:kube-dns --clusterrole=cluster-admin --serviceaccount=kube-system:default # use kubectl to create kubedns rc and service - ${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" --namespace=kube-system create -f kubedns-rc.yaml + ${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" --namespace=kube-system create -f kubedns-deployment.yaml ${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" --namespace=kube-system create -f kubedns-svc.yaml echo "Kube-dns rc and service successfully deployed." - rm kubedns-rc.yaml kubedns-svc.yaml + rm kubedns-deployment.yaml kubedns-svc.yaml fi }