github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-11-03 23:40:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8105 from thockin/dns-domain

Browse Source 
Rename default DNS domain to cluster.local
This commit is contained in:
Clayton Coleman
2015-05-12 17:18:45 -04:00
parent 0b0bace006 e83e49b076
commit 7d620c20b9
14 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
View File

@@ -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

2
cluster/addons/dns/kube2sky/kube2sky.go
View File

@@ -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")

2
cluster/aws/config-default.sh
View File

@@ -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

2
cluster/aws/config-test.sh
View File

@@ -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

2
cluster/gce/config-default.sh
View File

@@ -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

2
cluster/gce/config-test.sh
View File

@@ -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

2
cluster/gce/coreos/node.yaml
View File

@@ -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

2
cluster/libvirt-coreos/config-default.sh
View File

@@ -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

2
cluster/rackspace/config-default.sh
View File

@@ -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

4
cluster/ubuntu/config-default.sh
View File

@@ -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=""
#RUNTIME_CONFIG=""

4
cluster/ubuntu/skydns-rc.yaml
View File

@@ -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

2
cluster/vagrant/config-default.sh
View File

@@ -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

2
cluster/vsphere/config-default.sh
View File

@@ -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

2
test/e2e/service.go
View File

@@ -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",
}