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

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.

Merge pull request #27647 from quinton-hoole/2016-06-17-excise-example.com
42a88fc3 · k8s-merge-robot · GitHub · db904257 · 8d8d1922 · 42a88fc3
Commit 42a88fc3 authored Jun 17, 2016 by k8s-merge-robot Committed by GitHub Jun 17, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

common.sh federation/cluster/common.sh +1 -1

No files found.
--- a/federation/cluster/common.sh
+++ b/federation/cluster/common.sh
@@ -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"