Allow additional istio gateways to be specified

inviqa · Jan 10, 2020 · edb581f · edb581f
1 parent eac65e4
commit edb581f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/harness/attributes/common.yml b/harness/attributes/common.yml
@@ -89,9 +89,6 @@ attributes.default:
   git:
     main_branch: develop
 
-  istio:
-    additionalGateways: []
-
   nginx:
     # used to set site specific configurations under server directive
     site:

diff --git a/harness/attributes/docker-base.yml b/harness/attributes/docker-base.yml
@@ -45,6 +45,8 @@ attributes:
         nginx:
           environment:
             FPM_HOST: localhost
+      istio:
+        additionalGateways: []
     qa:
       services:
         php-base:

diff --git a/helm/app/values.yaml.twig b/helm/app/values.yaml.twig
@@ -31,4 +31,4 @@ resourcePrefix: {{ @('pipeline.base.resourcePrefix') | json_encode | raw }}
 
 ingress: "standard" # standard or istio
 istio:
-{{ to_nice_yaml(@('istio'), 2, 2) | raw }}
+{{ to_nice_yaml(@('pipeline.base.istio'), 2, 2) | raw }}
-Original file line number
+Diff line change
@@ Expand Up / @@ -89,9 +89,6 @@ attributes.default: @@
       git:
         main_branch: develop
-      istio:
-        additionalGateways: []
       nginx:
         # used to set site specific configurations under server directive
         site:
@@ Expand Down @@