diff --git a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml index e4793a7d91c..cecbb239bd6 100644 --- a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml @@ -20,7 +20,7 @@ spec: name: heapster env: - name: FLAGS - value: "--poll_duration=2m --stats_resolution=1m --sink influxdb:http://monitoring-influxdb.default.kubernetes.local:8086" + value: "--poll_duration=2m --stats_resolution=1m --sink influxdb:http://monitoring-influxdb.default:8086" volumeMounts: - name: ssl-certs mountPath: /etc/ssl/certs diff --git a/cluster/addons/dns/kube2sky/kube2sky.go b/cluster/addons/dns/kube2sky/kube2sky.go index 5e0c7856143..cd443e01805 100644 --- a/cluster/addons/dns/kube2sky/kube2sky.go +++ b/cluster/addons/dns/kube2sky/kube2sky.go @@ -44,7 +44,7 @@ import ( ) var ( - argDomain = flag.String("domain", "kubernetes.local", "domain under which to create names") + argDomain = flag.String("domain", "cluster.local", "domain under which to create names") argEtcdMutationTimeout = flag.Duration("etcd_mutation_timeout", 10*time.Second, "crash after retrying etcd mutation for a specified duration") argEtcdServer = flag.String("etcd-server", "http://127.0.0.1:4001", "URL to etcd server") argKubecfgFile = flag.String("kubecfg_file", "", "Location of kubecfg file for access to kubernetes service") diff --git a/cluster/aws/config-default.sh b/cluster/aws/config-default.sh index 63a84877c71..f8e5430516d 100644 --- a/cluster/aws/config-default.sh +++ b/cluster/aws/config-default.sh @@ -68,7 +68,7 @@ EXTRA_DOCKER_OPTS="--insecure-registry 10.0.0.0/8" # Optional: Install cluster DNS. ENABLE_CLUSTER_DNS=true DNS_SERVER_IP="10.0.0.10" -DNS_DOMAIN="kubernetes.local" +DNS_DOMAIN="cluster.local" DNS_REPLICAS=1 # Admission Controllers to invoke prior to persisting objects in cluster diff --git a/cluster/aws/config-test.sh b/cluster/aws/config-test.sh index db49d9366f2..ea55c15f5eb 100755 --- a/cluster/aws/config-test.sh +++ b/cluster/aws/config-test.sh @@ -64,7 +64,7 @@ EXTRA_DOCKER_OPTS="--insecure-registry 10.0.0.0/8" # Optional: Install cluster DNS. ENABLE_CLUSTER_DNS=true DNS_SERVER_IP="10.0.0.10" -DNS_DOMAIN="kubernetes.local" +DNS_DOMAIN="cluster.local" DNS_REPLICAS=1 # Admission Controllers to invoke prior to persisting objects in cluster diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index fa5934f9a62..de56775bc25 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -72,7 +72,7 @@ EXTRA_DOCKER_OPTS="--insecure-registry 10.0.0.0/8" # Optional: Install cluster DNS. ENABLE_CLUSTER_DNS=true DNS_SERVER_IP="10.0.0.10" -DNS_DOMAIN="kubernetes.local" +DNS_DOMAIN="cluster.local" DNS_REPLICAS=1 # Admission Controllers to invoke prior to persisting objects in cluster diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index b699fe37037..56dc8163b18 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -71,7 +71,7 @@ EXTRA_DOCKER_OPTS="--insecure-registry 10.0.0.0/8" # Optional: Install cluster DNS. ENABLE_CLUSTER_DNS=true DNS_SERVER_IP="10.0.0.10" -DNS_DOMAIN="kubernetes.local" +DNS_DOMAIN="cluster.local" DNS_REPLICAS=1 ADMISSION_CONTROL=NamespaceAutoProvision,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota diff --git a/cluster/gce/coreos/node.yaml b/cluster/gce/coreos/node.yaml index 97daf77fa6c..746714a319e 100644 --- a/cluster/gce/coreos/node.yaml +++ b/cluster/gce/coreos/node.yaml @@ -129,7 +129,7 @@ coreos: --allow_privileged=False \ --v=2 \ --cluster_dns=10.0.0.10 \ - --cluster_domain=kubernetes.local \ + --cluster_domain=cluster.local \ --logtostderr=true \ --container-runtime=${KUBERNETES_CONTAINER_RUNTIME} Restart=always diff --git a/cluster/libvirt-coreos/config-default.sh b/cluster/libvirt-coreos/config-default.sh index e43684e94dc..7a87873729a 100644 --- a/cluster/libvirt-coreos/config-default.sh +++ b/cluster/libvirt-coreos/config-default.sh @@ -58,5 +58,5 @@ LOGGING_DESTINATION=elasticsearch # Optional: Install cluster DNS. ENABLE_CLUSTER_DNS=true DNS_SERVER_IP="10.11.0.254" -DNS_DOMAIN="kubernetes.local" +DNS_DOMAIN="cluster.local" DNS_REPLICAS=1 diff --git a/cluster/rackspace/config-default.sh b/cluster/rackspace/config-default.sh index 4110b210f70..9092a7f1f8c 100644 --- a/cluster/rackspace/config-default.sh +++ b/cluster/rackspace/config-default.sh @@ -55,5 +55,5 @@ ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-true}" # Optional: Install cluster DNS. ENABLE_CLUSTER_DNS=true DNS_SERVER_IP="10.0.0.10" -DNS_DOMAIN="kubernetes.local" +DNS_DOMAIN="cluster.local" DNS_REPLICAS=1 diff --git a/cluster/ubuntu/config-default.sh b/cluster/ubuntu/config-default.sh index 53d25eaa8ee..6ce4031f5d4 100755 --- a/cluster/ubuntu/config-default.sh +++ b/cluster/ubuntu/config-default.sh @@ -54,8 +54,8 @@ DOCKER_OPTS="" ENABLE_CLUSTER_DNS=true # DNS_SERVER_IP must be a IP in PORTAL_NET range DNS_SERVER_IP="192.168.3.10" -DNS_DOMAIN="kubernetes.local" +DNS_DOMAIN="cluster.local" DNS_REPLICAS=1 # Optional: Enable setting flags for kube-apiserver to turn on behavior in active-dev -#RUNTIME_CONFIG="" \ No newline at end of file +#RUNTIME_CONFIG="" diff --git a/cluster/ubuntu/skydns-rc.yaml b/cluster/ubuntu/skydns-rc.yaml index b3a3bcb8a06..86fbae18b0a 100644 --- a/cluster/ubuntu/skydns-rc.yaml +++ b/cluster/ubuntu/skydns-rc.yaml @@ -31,7 +31,7 @@ spec: image: gcr.io/google_containers/kube2sky:1.4 args: # entrypoint = "/kube2sky" - - -domain=kubernetes.local + - -domain=cluster.local - -kubecfg_file=/etc/dns_token/kubeconfig volumeMounts: - mountPath: /etc/dns_token @@ -43,7 +43,7 @@ spec: # entrypoint = "/skydns" - -machines=http://localhost:4001 - -addr=0.0.0.0:53 - - -domain=kubernetes.local. + - -domain=cluster.local. ports: - containerPort: 53 name: dns diff --git a/cluster/vagrant/config-default.sh b/cluster/vagrant/config-default.sh index 9b910d3d6a7..a59f1b95e0d 100755 --- a/cluster/vagrant/config-default.sh +++ b/cluster/vagrant/config-default.sh @@ -73,7 +73,7 @@ DOCKER_OPTS="" # Optional: Install cluster DNS. ENABLE_CLUSTER_DNS=true DNS_SERVER_IP="10.247.0.10" -DNS_DOMAIN="kubernetes.local" +DNS_DOMAIN="cluster.local" DNS_REPLICAS=1 # Optional: Enable setting flags for kube-apiserver to turn on behavior in active-dev diff --git a/cluster/vsphere/config-default.sh b/cluster/vsphere/config-default.sh index 1190ef06fc0..8d629f63eb4 100755 --- a/cluster/vsphere/config-default.sh +++ b/cluster/vsphere/config-default.sh @@ -50,5 +50,5 @@ ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-true}" # Optional: Install cluster DNS. ENABLE_CLUSTER_DNS=true DNS_SERVER_IP="10.244.240.240" -DNS_DOMAIN="kubernetes.local" +DNS_DOMAIN="cluster.local" DNS_REPLICAS=1 diff --git a/test/e2e/service.go b/test/e2e/service.go index 3dc90da2f10..3954a7638ba 100644 --- a/test/e2e/service.go +++ b/test/e2e/service.go @@ -61,7 +61,7 @@ var _ = Describe("Services", func() { namesToResolve := []string{ "kubernetes-ro", "kubernetes-ro.default", - "kubernetes-ro.default.kubernetes.local", + "kubernetes-ro.default.cluster.local", "google.com", }