github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #27647 from quinton-hoole/2016-06-17-excise-example.com

Browse Source 
Automatic merge from submit-queue

Change default Federation DNS zone to be RFC 2606 compliant.

example.com is reserved, so don't use it.
Use federation.example instead.
This commit is contained in:
k8s-merge-robot
2016-06-17 21:10:51 -07:00
committed by GitHub
parent db904257f9 8d8d1922dd
commit 42a88fc304
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
federation/cluster/common.sh
View File

@@ -94,7 +94,7 @@ function create-federation-api-objects {
export FEDERATION_API_NODEPORT=32111
export FEDERATION_NAMESPACE
export FEDERATION_NAME="${FEDERATION_NAME:-federation}"
export DNS_ZONE_NAME="${DNS_ZONE_NAME:-example.com}"
export DNS_ZONE_NAME="${DNS_ZONE_NAME:-federation.example}" # See https://tools.ietf.org/html/rfc2606
template="go run ${KUBE_ROOT}/federation/cluster/template.go"