Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Mar 3, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/cluster_up_down.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/jenkins/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion examples/jenkins/pipeline/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hack/lib/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ function os::start::router() {
# Create a TLS certificate for the router
if [[ -n "${CREATE_ROUTER_CERT:-}" ]]; then
os::log::debug "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" \
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/graph/test/bc-missing-output.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkg/bootstrap/docker/openshift/admin.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down
2 changes: 1 addition & 1 deletion pkg/bootstrap/docker/openshift/helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/bootstrap/docker/openshift/logging.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
2 changes: 1 addition & 1 deletion pkg/bootstrap/docker/openshift/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
2 changes: 1 addition & 1 deletion pkg/bootstrap/docker/up.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/cli/cmd/cluster/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.`)
)

Expand Down
4 changes: 2 additions & 2 deletions test/extended/builds/gitauth.go
Original file line number Diff line number Diff line change
@@ -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 (
Expand Down Expand Up @@ -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"
Expand Down