Merge pull request #408 from chmouel/nip

Set default domain to nip.io
fabric8io · Jun 28, 2017 · 3ef7078 · 3ef7078
2 parents 2818917 + b83e96f
commit 3ef7078
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/cmds/deploy.go b/cmds/deploy.go
@@ -259,9 +259,9 @@ func deploy(f *cmdutil.Factory, d DefaultFabric8Deployment) {
 		util.Fatalf("%s", err)
 	}
 
-	// default xip domain if local deployment incase users deploy ingress controller or router
+	// default nip domain if local deployment incase users deploy ingress controller or router
 	if mini && typeOfMaster == util.OpenShift {
-		domain = ip + ".xip.io"
+		domain = ip + ".nip.io"
 	}
 
 	// default to the server from the current context

diff --git a/cmds/upgrade.go b/cmds/upgrade.go
@@ -20,16 +20,17 @@ import (
 	"io/ioutil"
 	"net/http"
 
+	"net"
+	"net/url"
+	"strings"
+
 	"github.com/fabric8io/gofabric8/client"
 	"github.com/fabric8io/gofabric8/util"
 	oclient "github.com/openshift/origin/pkg/client"
 	"github.com/spf13/cobra"
 	kapi "k8s.io/kubernetes/pkg/api"
 	k8sclient "k8s.io/kubernetes/pkg/client/unversioned"
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
-	"net"
-	"net/url"
-	"strings"
 )
 
 const (
@@ -83,9 +84,9 @@ func NewCmdUpgrade(f *cmdutil.Factory) *cobra.Command {
 					util.Failuref("error checking if minikube or minishift %v", err)
 				}
 
-				// default xip domain if local deployment incase users deploy ingress controller or router
+				// default nip domain if local deployment incase users deploy ingress controller or router
 				if mini && typeOfMaster == util.OpenShift {
-					domain = ip + ".xip.io"
+					domain = ip + ".nip.io"
 				}
 				if len(apiserver) == 0 {
 					apiserver = u.Host