Switch to nip.io from xip.io for default cluster up wildcard DNS

docs/cluster_up_down.md

@@ -372,7 +372,7 @@ If a host data directory is not specified, the data directory used by OpenShift
 
 ## Routing
 
-The default routing suffix used by `oc cluster up` is CLUSTER_IP.xip.io where CLUSTER_IP is the IP address of your cluster.
+The default routing suffix used by `oc cluster up` is CLUSTER_IP.nip.io where CLUSTER_IP is the IP address of your cluster.
 To use a different suffix, specify it with `--routing-suffix`.
 
 ## Specifying Images to Use

docs/man/man1/oc-cluster-up.1

@@ -22,7 +22,7 @@ This command will attempt to use an existing connection to a Docker daemon. Befo
 Optionally, the command can create a new Docker machine for OpenShift using the VirtualBox driver when the \-\-create\-machine argument is specified. The machine will be named 'openshift' by default. To name the machine differently, use the \-\-docker\-machine=NAME argument. If the \-\-docker\-machine=NAME argument is specified, but \-\-create\-machine is not, the command will attempt to find an existing docker machine with that name and start it if it's not running.
 
 .PP
-By default, the OpenShift cluster will be setup to use a routing suffix that ends in xip.io. This is to allow dynamic host names to be created for routes. An alternate routing suffix can be specified using the \-\-routing\-suffix flag.
+By default, the OpenShift cluster will be setup to use a routing suffix that ends in nip.io. This is to allow dynamic host names to be created for routes. An alternate routing suffix can be specified using the \-\-routing\-suffix flag.
 
 .PP
 A public hostname can also be specified for the server with the \-\-public\-hostname flag.

docs/man/man1/oc-cluster.1

@@ -28,7 +28,7 @@ To use an existing Docker connection, ensure that Docker commands are working an
 By default, etcd data will not be preserved between container restarts. If you wish to preserve your data, specify a value for \-\-host\-data\-dir and the \-\-use\-existing\-config flag.
 
 .PP
-Default routes are setup using xip.io and the host ip of your cluster. To use a different routing suffix, use the \-\-routing\-suffix flag.
+Default routes are setup using nip.io and the host ip of your cluster. To use a different routing suffix, use the \-\-routing\-suffix flag.
 
 
 .SH OPTIONS INHERITED FROM PARENT COMMANDS

docs/man/man1/openshift-cli-cluster-up.1

@@ -22,7 +22,7 @@ This command will attempt to use an existing connection to a Docker daemon. Befo
 Optionally, the command can create a new Docker machine for OpenShift using the VirtualBox driver when the \-\-create\-machine argument is specified. The machine will be named 'openshift' by default. To name the machine differently, use the \-\-docker\-machine=NAME argument. If the \-\-docker\-machine=NAME argument is specified, but \-\-create\-machine is not, the command will attempt to find an existing docker machine with that name and start it if it's not running.
 
 .PP
-By default, the OpenShift cluster will be setup to use a routing suffix that ends in xip.io. This is to allow dynamic host names to be created for routes. An alternate routing suffix can be specified using the \-\-routing\-suffix flag.
+By default, the OpenShift cluster will be setup to use a routing suffix that ends in nip.io. This is to allow dynamic host names to be created for routes. An alternate routing suffix can be specified using the \-\-routing\-suffix flag.
 
 .PP
 A public hostname can also be specified for the server with the \-\-public\-hostname flag.

docs/man/man1/openshift-cli-cluster.1

@@ -28,7 +28,7 @@ To use an existing Docker connection, ensure that Docker commands are working an
 By default, etcd data will not be preserved between container restarts. If you wish to preserve your data, specify a value for \-\-host\-data\-dir and the \-\-use\-existing\-config flag.
 
 .PP
-Default routes are setup using xip.io and the host ip of your cluster. To use a different routing suffix, use the \-\-routing\-suffix flag.
+Default routes are setup using nip.io and the host ip of your cluster. To use a different routing suffix, use the \-\-routing\-suffix flag.
 
 
 .SH OPTIONS INHERITED FROM PARENT COMMANDS

examples/jenkins/README.md

@@ -47,7 +47,7 @@ Steps
 
     and access the host for the Jenkins route.
 
-    If you do not have a router or your host system does not support xip.io name resolution, you can access jenkins directly via the service ip.  Determine the jenkins service ip ("oc get svc") and go to it in your browser on port 80.  Do not confuse it with the jenkins-jnlp service.
+    If you do not have a router or your host system does not support nip.io name resolution, you can access jenkins directly via the service ip.  Determine the jenkins service ip ("oc get svc") and go to it in your browser on port 80.  Do not confuse it with the jenkins-jnlp service.
 
     **Note**: The OpenShift Login plugin by default manages authentication into any Jenkins instance running in OpenShift.  When this is the case, and you do intend to access Jenkins via the Service IP and not the Route, then you will need to annotate the Jenkins service account with a redirect URL so that the OAuth server's whitelist is updated and allow the login to Jenkins to complete. 
 

examples/jenkins/pipeline/README.md

@@ -54,7 +54,7 @@ jenkins template represented by jenkinstemplate.json by running these commands a
 
     and access the host for the Jenkins route.
 
-    If you do not have a router, or your host system does not support xip.io name resolution you can access jenkins directly via the service ip.  Determine the jenkins service ip ("oc get svc") and go to it in your browser on port 80.  Do not confuse it with the jenkins-jnlp service.
+    If you do not have a router, or your host system does not support nip.io name resolution you can access jenkins directly via the service ip.  Determine the jenkins service ip ("oc get svc") and go to it in your browser on port 80.  Do not confuse it with the jenkins-jnlp service.
     If you take this approach, run the following command before attempting to log into Jenkins:
 
         $ oc annotate sa/jenkins serviceaccounts.openshift.io/oauth-redirecturi.1=http://<jenkins_service_ip:jenkins_service_port>/securityRealm/finishLogin --overwrite

hack/lib/start.sh

@@ -618,7 +618,7 @@ function os::start::router() {
 	# Create a TLS certificate for the router
 	if [[ -n "${CREATE_ROUTER_CERT:-}" ]]; then
 		os::log::info "Generating router TLS certificate"
-		oadm ca create-server-cert --hostnames="*.${API_HOST}.xip.io"          \
+		oadm ca create-server-cert --hostnames="*.${API_HOST}.nip.io"          \
 		                           --key="${MASTER_CONFIG_DIR}/router.key"     \
 		                           --cert="${MASTER_CONFIG_DIR}/router.crt"    \
 		                           --signer-key="${MASTER_CONFIG_DIR}/ca.key"  \

pkg/api/graph/test/bc-missing-output.yaml

@@ -13,7 +13,7 @@ spec:
   resources: {}
   source:
     git:
-      uri: http://gitserver-tokenauth.linux.xip.io/ruby-hello-world
+      uri: http://gitserver-tokenauth.linux.nip.io/ruby-hello-world
     sourceSecret:
       name: builder-token-nbme5
     type: Git

pkg/bootstrap/docker/openshift/admin.go

@@ -120,10 +120,10 @@ func (h *Helper) InstallRouter(kubeClient kclientset.Interface, f *clientcmd.Fac
 		},
 		Overwrite: true,
 		Hostnames: []string{
-			fmt.Sprintf("%s.xip.io", hostIP),
+			fmt.Sprintf("%s.nip.io", hostIP),
 			// This will ensure that routes using edge termination and the default
 			// certs will use certs valid for their arbitrary subdomain names.
-			fmt.Sprintf("*.%s.xip.io", hostIP),
+			fmt.Sprintf("*.%s.nip.io", hostIP),
 		},
 		CertFile: filepath.Join(masterDir, "router.crt"),
 		KeyFile:  filepath.Join(masterDir, "router.key"),

pkg/bootstrap/docker/openshift/helper.go

@@ -593,7 +593,7 @@ func (h *Helper) updateConfig(configDir string, opt *StartOptions) error {
 	if len(opt.RoutingSuffix) > 0 {
 		cfg.RoutingConfig.Subdomain = opt.RoutingSuffix
 	} else {
-		cfg.RoutingConfig.Subdomain = fmt.Sprintf("%s.xip.io", opt.RouterIP)
+		cfg.RoutingConfig.Subdomain = fmt.Sprintf("%s.nip.io", opt.RouterIP)
 	}
 
 	if len(opt.MetricsHost) > 0 && cfg.AssetConfig != nil {

pkg/bootstrap/docker/openshift/logging.go

@@ -133,5 +133,5 @@ func LoggingHost(routingSuffix, serverIP string) string {
 	if len(routingSuffix) > 0 {
 		return fmt.Sprintf("kibana-logging.%s", routingSuffix)
 	}
-	return fmt.Sprintf("kibana-logging.%s.xip.io", serverIP)
+	return fmt.Sprintf("kibana-logging.%s.nip.io", serverIP)
 }

pkg/bootstrap/docker/openshift/metrics.go

@@ -212,5 +212,5 @@ func MetricsHost(routingSuffix, serverIP string) string {
 	if len(routingSuffix) > 0 {
 		return fmt.Sprintf("metrics-openshift-infra.%s", routingSuffix)
 	}
-	return fmt.Sprintf("metrics-openshift-infra.%s.xip.io", serverIP)
+	return fmt.Sprintf("metrics-openshift-infra.%s.nip.io", serverIP)
 }

pkg/bootstrap/docker/up.go

@@ -70,7 +70,7 @@ var (
 		--docker-machine=NAME argument is specified, but --create-machine is not, the command will attempt
 		to find an existing docker machine with that name and start it if it's not running.
 
-		By default, the OpenShift cluster will be setup to use a routing suffix that ends in xip.io.
+		By default, the OpenShift cluster will be setup to use a routing suffix that ends in nip.io.
 		This is to allow dynamic host names to be created for routes. An alternate routing suffix
 		can be specified using the --routing-suffix flag.
 

pkg/cmd/cli/cmd/cluster/cluster.go

@@ -32,7 +32,7 @@ var (
 		By default, etcd data will not be preserved between container restarts. If you wish to
 		preserve your data, specify a value for --host-data-dir and the --use-existing-config flag.
 
-		Default routes are setup using xip.io and the host ip of your cluster. To use a different
+		Default routes are setup using nip.io and the host ip of your cluster. To use a different
 		routing suffix, use the --routing-suffix flag.`)
 )
 

test/extended/builds/gitauth.go

@@ -1,6 +1,6 @@
 package builds
 
-// these tests are diabled because the xip.io dns hook was proving way too unreliable;
+// these tests are disabled because the xip.io dns hook was proving way too unreliable;
 // we will reenable once an agreeable alternative is derived to get name resolution for the routes
 
 /*import (
@@ -30,7 +30,7 @@ var _ = g.Describe("[builds][Slow] can use private repositories as build input",
 	const (
 		gitServerDeploymentConfigName = "gitserver"
 		sourceSecretName              = "sourcesecret"
-		hostNameSuffix                = "xip.io"
+		hostNameSuffix                = "nip.io"
 		gitUserName                   = "gituser"
 		gitPassword                   = "gituserpassword"
 		buildConfigName               = "gitauthtest"