Merge pull request #201 from inviqa/feature/istio-additional-gateways

Allow additional istio gateways to be specified
inviqa · Jan 13, 2020 · 237d202 · 237d202
2 parents 7534ed4 + 03002e2
commit 237d202
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/src/_base/harness/attributes/docker-base.yml b/src/_base/harness/attributes/docker-base.yml
@@ -45,6 +45,8 @@ attributes:
         nginx:
           environment:
             FPM_HOST: localhost
+      istio:
+        additionalGateways: []
     qa:
       services:
         php-base:

diff --git a/src/_base/helm/app/templates/application/webapp/ingress-istio.yaml b/src/_base/helm/app/templates/application/webapp/ingress-istio.yaml
@@ -11,6 +11,9 @@ spec:
  - {{ index .Values.docker.services "php-base" "environment" "APP_HOST" }}
  gateways:
  - istio-system/{{ .Release.Namespace }}-gateway
+{{- range $key, $value := .Values.istio.additionalGateways }}
+ - {{ $value | quote }}
+{{- end }}
  http:
  - route:
    - destination:

diff --git a/src/_base/helm/app/values.yaml.twig b/src/_base/helm/app/values.yaml.twig
@@ -27,5 +27,8 @@ resources:
 persistence:
 {{ to_nice_yaml(@('pipeline.base.persistence'), 2, 2) | raw }}
 
-ingress: "standard" # standard or istio
 resourcePrefix: {{ @('pipeline.base.resourcePrefix') | json_encode | raw }}
+
+ingress: "standard" # standard or istio
+istio:
+{{ to_nice_yaml(@('pipeline.base.istio'), 2, 2) | raw }}