mirror of
				https://github.com/k3s-io/kubernetes.git
				synced 2025-11-03 23:40:03 +00:00 
			
		
		
		
	rename default DNS domain to cluster.local
This commit is contained in:
		@@ -20,7 +20,7 @@ spec:
 | 
				
			|||||||
          name: heapster
 | 
					          name: heapster
 | 
				
			||||||
          env: 
 | 
					          env: 
 | 
				
			||||||
            - name: FLAGS
 | 
					            - 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: 
 | 
					          volumeMounts: 
 | 
				
			||||||
            - name: ssl-certs
 | 
					            - name: ssl-certs
 | 
				
			||||||
              mountPath: /etc/ssl/certs
 | 
					              mountPath: /etc/ssl/certs
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -44,7 +44,7 @@ import (
 | 
				
			|||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
var (
 | 
					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")
 | 
						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")
 | 
						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")
 | 
						argKubecfgFile         = flag.String("kubecfg_file", "", "Location of kubecfg file for access to kubernetes service")
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -68,7 +68,7 @@ EXTRA_DOCKER_OPTS="--insecure-registry 10.0.0.0/8"
 | 
				
			|||||||
# Optional: Install cluster DNS.
 | 
					# Optional: Install cluster DNS.
 | 
				
			||||||
ENABLE_CLUSTER_DNS=true
 | 
					ENABLE_CLUSTER_DNS=true
 | 
				
			||||||
DNS_SERVER_IP="10.0.0.10"
 | 
					DNS_SERVER_IP="10.0.0.10"
 | 
				
			||||||
DNS_DOMAIN="kubernetes.local"
 | 
					DNS_DOMAIN="cluster.local"
 | 
				
			||||||
DNS_REPLICAS=1
 | 
					DNS_REPLICAS=1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Admission Controllers to invoke prior to persisting objects in cluster
 | 
					# Admission Controllers to invoke prior to persisting objects in cluster
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -64,7 +64,7 @@ EXTRA_DOCKER_OPTS="--insecure-registry 10.0.0.0/8"
 | 
				
			|||||||
# Optional: Install cluster DNS.
 | 
					# Optional: Install cluster DNS.
 | 
				
			||||||
ENABLE_CLUSTER_DNS=true
 | 
					ENABLE_CLUSTER_DNS=true
 | 
				
			||||||
DNS_SERVER_IP="10.0.0.10"
 | 
					DNS_SERVER_IP="10.0.0.10"
 | 
				
			||||||
DNS_DOMAIN="kubernetes.local"
 | 
					DNS_DOMAIN="cluster.local"
 | 
				
			||||||
DNS_REPLICAS=1
 | 
					DNS_REPLICAS=1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Admission Controllers to invoke prior to persisting objects in cluster
 | 
					# Admission Controllers to invoke prior to persisting objects in cluster
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -72,7 +72,7 @@ EXTRA_DOCKER_OPTS="--insecure-registry 10.0.0.0/8"
 | 
				
			|||||||
# Optional: Install cluster DNS.
 | 
					# Optional: Install cluster DNS.
 | 
				
			||||||
ENABLE_CLUSTER_DNS=true
 | 
					ENABLE_CLUSTER_DNS=true
 | 
				
			||||||
DNS_SERVER_IP="10.0.0.10"
 | 
					DNS_SERVER_IP="10.0.0.10"
 | 
				
			||||||
DNS_DOMAIN="kubernetes.local"
 | 
					DNS_DOMAIN="cluster.local"
 | 
				
			||||||
DNS_REPLICAS=1
 | 
					DNS_REPLICAS=1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Admission Controllers to invoke prior to persisting objects in cluster
 | 
					# Admission Controllers to invoke prior to persisting objects in cluster
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -71,7 +71,7 @@ EXTRA_DOCKER_OPTS="--insecure-registry 10.0.0.0/8"
 | 
				
			|||||||
# Optional: Install cluster DNS.
 | 
					# Optional: Install cluster DNS.
 | 
				
			||||||
ENABLE_CLUSTER_DNS=true
 | 
					ENABLE_CLUSTER_DNS=true
 | 
				
			||||||
DNS_SERVER_IP="10.0.0.10"
 | 
					DNS_SERVER_IP="10.0.0.10"
 | 
				
			||||||
DNS_DOMAIN="kubernetes.local"
 | 
					DNS_DOMAIN="cluster.local"
 | 
				
			||||||
DNS_REPLICAS=1
 | 
					DNS_REPLICAS=1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ADMISSION_CONTROL=NamespaceAutoProvision,LimitRanger,SecurityContextDeny,ResourceQuota
 | 
					ADMISSION_CONTROL=NamespaceAutoProvision,LimitRanger,SecurityContextDeny,ResourceQuota
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -129,7 +129,7 @@ coreos:
 | 
				
			|||||||
        --allow_privileged=False \
 | 
					        --allow_privileged=False \
 | 
				
			||||||
        --v=2 \
 | 
					        --v=2 \
 | 
				
			||||||
        --cluster_dns=10.0.0.10 \
 | 
					        --cluster_dns=10.0.0.10 \
 | 
				
			||||||
        --cluster_domain=kubernetes.local \
 | 
					        --cluster_domain=cluster.local \
 | 
				
			||||||
        --logtostderr=true \
 | 
					        --logtostderr=true \
 | 
				
			||||||
        --container-runtime=${KUBERNETES_CONTAINER_RUNTIME}
 | 
					        --container-runtime=${KUBERNETES_CONTAINER_RUNTIME}
 | 
				
			||||||
        Restart=always
 | 
					        Restart=always
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -58,5 +58,5 @@ LOGGING_DESTINATION=elasticsearch
 | 
				
			|||||||
# Optional: Install cluster DNS.
 | 
					# Optional: Install cluster DNS.
 | 
				
			||||||
ENABLE_CLUSTER_DNS=true
 | 
					ENABLE_CLUSTER_DNS=true
 | 
				
			||||||
DNS_SERVER_IP="10.11.0.254"
 | 
					DNS_SERVER_IP="10.11.0.254"
 | 
				
			||||||
DNS_DOMAIN="kubernetes.local"
 | 
					DNS_DOMAIN="cluster.local"
 | 
				
			||||||
DNS_REPLICAS=1
 | 
					DNS_REPLICAS=1
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -55,5 +55,5 @@ ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-true}"
 | 
				
			|||||||
# Optional: Install cluster DNS.
 | 
					# Optional: Install cluster DNS.
 | 
				
			||||||
ENABLE_CLUSTER_DNS=true
 | 
					ENABLE_CLUSTER_DNS=true
 | 
				
			||||||
DNS_SERVER_IP="10.0.0.10"
 | 
					DNS_SERVER_IP="10.0.0.10"
 | 
				
			||||||
DNS_DOMAIN="kubernetes.local"
 | 
					DNS_DOMAIN="cluster.local"
 | 
				
			||||||
DNS_REPLICAS=1
 | 
					DNS_REPLICAS=1
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -54,7 +54,7 @@ DOCKER_OPTS=""
 | 
				
			|||||||
ENABLE_CLUSTER_DNS=true
 | 
					ENABLE_CLUSTER_DNS=true
 | 
				
			||||||
# DNS_SERVER_IP must be a IP in PORTAL_NET range
 | 
					# DNS_SERVER_IP must be a IP in PORTAL_NET range
 | 
				
			||||||
DNS_SERVER_IP="192.168.3.10"
 | 
					DNS_SERVER_IP="192.168.3.10"
 | 
				
			||||||
DNS_DOMAIN="kubernetes.local"
 | 
					DNS_DOMAIN="cluster.local"
 | 
				
			||||||
DNS_REPLICAS=1
 | 
					DNS_REPLICAS=1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Optional: Enable setting flags for kube-apiserver to turn on behavior in active-dev
 | 
					# Optional: Enable setting flags for kube-apiserver to turn on behavior in active-dev
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -31,7 +31,7 @@ spec:
 | 
				
			|||||||
        image: gcr.io/google_containers/kube2sky:1.4
 | 
					        image: gcr.io/google_containers/kube2sky:1.4
 | 
				
			||||||
        args:
 | 
					        args:
 | 
				
			||||||
        # entrypoint = "/kube2sky"
 | 
					        # entrypoint = "/kube2sky"
 | 
				
			||||||
        - -domain=kubernetes.local
 | 
					        - -domain=cluster.local
 | 
				
			||||||
        - -kubecfg_file=/etc/dns_token/kubeconfig
 | 
					        - -kubecfg_file=/etc/dns_token/kubeconfig
 | 
				
			||||||
        volumeMounts:
 | 
					        volumeMounts:
 | 
				
			||||||
        - mountPath: /etc/dns_token
 | 
					        - mountPath: /etc/dns_token
 | 
				
			||||||
@@ -43,7 +43,7 @@ spec:
 | 
				
			|||||||
        # entrypoint = "/skydns"
 | 
					        # entrypoint = "/skydns"
 | 
				
			||||||
        - -machines=http://localhost:4001
 | 
					        - -machines=http://localhost:4001
 | 
				
			||||||
        - -addr=0.0.0.0:53
 | 
					        - -addr=0.0.0.0:53
 | 
				
			||||||
        - -domain=kubernetes.local.
 | 
					        - -domain=cluster.local.
 | 
				
			||||||
        ports:
 | 
					        ports:
 | 
				
			||||||
        - containerPort: 53
 | 
					        - containerPort: 53
 | 
				
			||||||
          name: dns
 | 
					          name: dns
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -73,7 +73,7 @@ DOCKER_OPTS=""
 | 
				
			|||||||
# Optional: Install cluster DNS.
 | 
					# Optional: Install cluster DNS.
 | 
				
			||||||
ENABLE_CLUSTER_DNS=true
 | 
					ENABLE_CLUSTER_DNS=true
 | 
				
			||||||
DNS_SERVER_IP="10.247.0.10"
 | 
					DNS_SERVER_IP="10.247.0.10"
 | 
				
			||||||
DNS_DOMAIN="kubernetes.local"
 | 
					DNS_DOMAIN="cluster.local"
 | 
				
			||||||
DNS_REPLICAS=1
 | 
					DNS_REPLICAS=1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Optional: Enable setting flags for kube-apiserver to turn on behavior in active-dev
 | 
					# Optional: Enable setting flags for kube-apiserver to turn on behavior in active-dev
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -50,5 +50,5 @@ ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-true}"
 | 
				
			|||||||
# Optional: Install cluster DNS.
 | 
					# Optional: Install cluster DNS.
 | 
				
			||||||
ENABLE_CLUSTER_DNS=true
 | 
					ENABLE_CLUSTER_DNS=true
 | 
				
			||||||
DNS_SERVER_IP="10.244.240.240"
 | 
					DNS_SERVER_IP="10.244.240.240"
 | 
				
			||||||
DNS_DOMAIN="kubernetes.local"
 | 
					DNS_DOMAIN="cluster.local"
 | 
				
			||||||
DNS_REPLICAS=1
 | 
					DNS_REPLICAS=1
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -61,7 +61,7 @@ var _ = Describe("Services", func() {
 | 
				
			|||||||
		namesToResolve := []string{
 | 
							namesToResolve := []string{
 | 
				
			||||||
			"kubernetes-ro",
 | 
								"kubernetes-ro",
 | 
				
			||||||
			"kubernetes-ro.default",
 | 
								"kubernetes-ro.default",
 | 
				
			||||||
			"kubernetes-ro.default.kubernetes.local",
 | 
								"kubernetes-ro.default.cluster.local",
 | 
				
			||||||
			"google.com",
 | 
								"google.com",
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user