Merge pull request #141 from weaveworks/default-mesh

Set default mesh gateway only if no gateway is specified
fluxcd · Apr 8, 2019 · db673dd · db673dd
2 parents 2cd3fe4 + 88ad457
commit db673dd
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -80,6 +80,7 @@ spec:
     # Istio gateways (optional)
     gateways:
     - public-gateway.istio-system.svc.cluster.local
+    - mesh
     # Istio virtual service host names (optional)
     hosts:
     - podinfo.example.com

diff --git a/artifacts/ab-testing/canary.yaml b/artifacts/ab-testing/canary.yaml
@@ -23,6 +23,7 @@ spec:
     # Istio gateways (optional)
     gateways:
     - public-gateway.istio-system.svc.cluster.local
+    - mesh
     # Istio virtual service host names (optional)
     hosts:
     - abtest.istio.weavedx.com

diff --git a/artifacts/canaries/canary.yaml b/artifacts/canaries/canary.yaml
@@ -23,6 +23,7 @@ spec:
     # Istio gateways (optional)
     gateways:
     - public-gateway.istio-system.svc.cluster.local
+    - mesh
     # Istio virtual service host names (optional)
     hosts:
     - app.istio.weavedx.com

diff --git a/artifacts/configs/canary.yaml b/artifacts/configs/canary.yaml
@@ -23,6 +23,7 @@ spec:
     # Istio gateways (optional)
     gateways:
     - public-gateway.istio-system.svc.cluster.local
+    - mesh
     # Istio virtual service host names (optional)
     hosts:
     - app.iowa.weavedx.com

diff --git a/docs/gitbook/how-it-works.md b/docs/gitbook/how-it-works.md
@@ -38,6 +38,7 @@ spec:
     # Istio gateways (optional)
     gateways:
     - public-gateway.istio-system.svc.cluster.local
+    - mesh
     # Istio virtual service host names (optional)
     hosts:
     - podinfo.example.com
@@ -122,6 +123,7 @@ spec:
     # Istio gateways (optional)
     gateways:
     - public-gateway.istio-system.svc.cluster.local
+    - mesh
     # Istio virtual service host names (optional)
     hosts:
     - frontend.example.com

diff --git a/docs/gitbook/usage/ab-testing.md b/docs/gitbook/usage/ab-testing.md
@@ -60,6 +60,7 @@ spec:
     # Istio gateways (optional)
     gateways:
     - public-gateway.istio-system.svc.cluster.local
+    - mesh
     # Istio virtual service host names (optional)
     hosts:
     - app.example.com

diff --git a/docs/gitbook/usage/progressive-delivery.md b/docs/gitbook/usage/progressive-delivery.md
@@ -54,6 +54,7 @@ spec:
     # Istio gateways (optional)
     gateways:
     - public-gateway.istio-system.svc.cluster.local
+    - mesh
     # Istio virtual service host names (optional)
     hosts:
     - app.example.com

diff --git a/pkg/router/istio.go b/pkg/router/istio.go
@@ -50,7 +50,9 @@ func (ir *IstioRouter) Reconcile(canary *flaggerv1.Canary) error {
 			break
 		}
 	}
-	if !hasMeshGateway {
+
+	// set default mesh gateway if no gateway is specified
+	if !hasMeshGateway && len(canary.Spec.Service.Gateways) == 0 {
 		gateways = append(gateways, "mesh")
 	}