Hide ingress install option

rancher · Sep 20, 2019 · 021c4dc · 021c4dc
1 parent fd100df
commit 021c4dc
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/cli/cmd/install/install.go b/cli/cmd/install/install.go
@@ -116,7 +116,7 @@ type Install struct {
 	Yaml            bool     `desc:"Only print out k8s yaml manifest"`
 	Check           bool     `desc:"Only check status, don't deploy controller"`
 	Lite            bool     `desc:"Only install lite version of Rio(monitoring will be disabled, will be ignored if --disable-features is set)"`
-	Mode            string   `desc:"Install mode to expose gateway. Available options are ingress, svclb and hostport" default:"ingress"`
+	Mode            string   `desc:"Install mode to expose gateway. Available options are svclb and hostport" default:"svclb"`
 	MeshMode        string   `desc:"Service mesh mode. Options: (linkerd/istio)" default:"linkerd"`
 }
 

diff --git a/modules/gateway/controllers/istio/populate/gateway_test.go b/modules/gateway/controllers/istio/populate/gateway_test.go
@@ -26,16 +26,16 @@ func TestGatewayWithoutPublicdomains(t *testing.T) {
 				{
 					Port: v1alpha3.Port{
 						Protocol: v1alpha3.ProtocolHTTP,
-						Number:   80,
-						Name:     "http-80",
+						Number:   9080,
+						Name:     "http-9080",
 					},
 					Hosts: []string{"*"},
 				},
 				{
 					Port: v1alpha3.Port{
 						Protocol: v1alpha3.ProtocolHTTPS,
-						Number:   443,
-						Name:     "https-443",
+						Number:   9443,
+						Name:     "https-9443",
 					},
 					Hosts: []string{"*"},
 					TLS: &v1alpha3.TLSOptions{
@@ -87,16 +87,16 @@ func TestGatewayWithPublicdomains(t *testing.T) {
 				{
 					Port: v1alpha3.Port{
 						Protocol: v1alpha3.ProtocolHTTP,
-						Number:   80,
-						Name:     "http-80",
+						Number:   9080,
+						Name:     "http-9080",
 					},
 					Hosts: []string{"*"},
 				},
 				{
 					Port: v1alpha3.Port{
 						Protocol: v1alpha3.ProtocolHTTPS,
-						Number:   443,
-						Name:     "https-443",
+						Number:   9443,
+						Name:     "https-9443",
 					},
 					Hosts: []string{"*"},
 					TLS: &v1alpha3.TLSOptions{
@@ -107,8 +107,8 @@ func TestGatewayWithPublicdomains(t *testing.T) {
 				{
 					Port: v1alpha3.Port{
 						Protocol: v1alpha3.ProtocolHTTPS,
-						Number:   443,
-						Name:     "pd1-https-443",
+						Number:   9443,
+						Name:     "pd1-https-9443",
 					},
 					Hosts: []string{"www.foo.com"},
 					TLS: &v1alpha3.TLSOptions{
@@ -119,8 +119,8 @@ func TestGatewayWithPublicdomains(t *testing.T) {
 				{
 					Port: v1alpha3.Port{
 						Protocol: v1alpha3.ProtocolHTTPS,
-						Number:   443,
-						Name:     "pd2-https-443",
+						Number:   9443,
+						Name:     "pd2-https-9443",
 					},
 					Hosts: []string{"www.bar.com"},
 					TLS: &v1alpha3.TLSOptions{

diff --git a/modules/gateway/controllers/service/populate/virtualservice_test.go b/modules/gateway/controllers/service/populate/virtualservice_test.go
@@ -70,14 +70,14 @@ func TestVirtualServices(t *testing.T) {
 								"mesh",
 								"rio-gateway.rio-system-fake.svc.cluster.local",
 							},
-							Port: 80,
+							Port: 9080,
 						},
 						{
 							Gateways: []string{
 								"mesh",
 								"rio-gateway.rio-system-fake.svc.cluster.local",
 							},
-							Port: 443,
+							Port: 9443,
 						},
 						{
 							Gateways: []string{

diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go
@@ -15,9 +15,9 @@ var (
 	ControllerImage       = "rancher/rio-controller"
 	ControllerImageTag    = "dev"
 	ClusterDomainName     = "cluster-domain"
-	DefaultHTTPOpenPort   = "80"
-	DefaultHTTPSOpenPort  = "443"
-	InstallMode           = InstallModeIngress
+	DefaultHTTPOpenPort   = "9080"
+	DefaultHTTPSOpenPort  = "9443"
+	InstallMode           = InstallModeSvclb
 	UseIPAddress          = ""
 	ServiceCidr           = ""
 	DefaultServiceVersion = "v0"