Revert "GKE: Add ENABLE_CLUSTER_DNS, compute appropriate DNS_SERVER_IP"

We actually can't yet support cluster DNS inside GKE yet; it conflicts
with how we handle startup internally.

This reverts commit fdccfe970d.
This commit is contained in:
Zach Loafman
2015-01-07 14:48:48 -08:00
parent d314862e46
commit a203410f15
2 changed files with 1 additions and 24 deletions

View File

@@ -27,15 +27,7 @@ CLUSTER_API_VERSION="${CLUSTER_API_VERSION:-}"
NETWORK="${NETWORK:-default}"
GCLOUD="${GCLOUD:-gcloud}"
GCLOUD_CONFIG_DIR="${GCLOUD_CONFIG_DIR:-${HOME}/.config/gcloud/kubernetes}"
# Optional: Install cluster DNS.
# TODO: enable this when DNS_SERVER_IP can be easily bound.
ENABLE_CLUSTER_DNS=true
# DNS_SERVER_IP bound during kube-up using servicesIpv4Cidr
# and DNS_SERVER_OCTET.
DNS_SERVER_OCTET="10"
DNS_DOMAIN="kubernetes.local"
DNS_REPLICAS=1
ENABLE_CLUSTER_DNS=false
# This is a hack, but I keep setting this when I run commands manually, and
# then things grossly fail during normal runs because cluster/kubecfg.sh and