Configure ingress rewrite path and targets depending on the nginx-con…

…troller version. (microsoft#2)
portegah85 · Dec 18, 2019 · 920e908 · 920e908
1 parent 044dc32
commit 920e908
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 24 deletions.
diff --git a/Deploy/helm/cart-api/templates/ingress.yaml b/Deploy/helm/cart-api/templates/ingress.yaml
@@ -31,7 +31,7 @@ spec:
     - host: {{ . }}
       http:
         paths:
-          - path: {{ $ingressPath }}(/|$)(.*)
+          - path: {{ $ingressPath }}
             backend:
               serviceName: cart
               servicePort: http

diff --git a/Deploy/helm/coupons-api/templates/ingress.yaml b/Deploy/helm/coupons-api/templates/ingress.yaml
@@ -31,7 +31,7 @@ spec:
     - host: {{ . }}
       http:
         paths:
-          - path: {{ $ingressPath }}(/|$)(.*)
+          - path: {{ $ingressPath }}
             backend:
               serviceName: coupons
               servicePort: http

diff --git a/Deploy/helm/gvalues.template b/Deploy/helm/gvalues.template
@@ -40,27 +40,27 @@ inf:
     id: {{appinsightsik}}
   ingress:
     products:
-      path: /product-api
+      path: /product-api{{ingressrewritepath}}
     profile:
-      path: /profile-api
+      path: /profile-api{{ingressrewritepath}}
     coupons:
-      path: /coupons-api
+      path: /coupons-api{{ingressrewritepath}}
     popularproducts:
-      path: /popular-products-api
+      path: /popular-products-api{{ingressrewritepath}}
     stock:
-      path: /stock-api
+      path: /stock-api{{ingressrewritepath}}
     imageclassifier:
-      path: /image-classifier-api
+      path: /image-classifier-api{{ingressrewritepath}}
     mobilebff:
-      path: /mobilebff
+      path: /mobilebff{{ingressrewritepath}}
     webbff:
-      path: /webbff    
+      path: /webbff{{ingressrewritepath}}
     login:
-      path: /login-api      
+      path: /login-api{{ingressrewritepath}}
     cart:
-      path: /cart-api
+      path: /cart-api{{ingressrewritepath}}
     rewardsregistration:
-      path: /rewards-registration-api
+      path: /rewards-registration-api{{ingressrewritepath}}
   apiurls:
     popularproductsapiurl: http://popularproducts
     productsapiurl: http://product 
@@ -80,8 +80,8 @@ ingress:
     kubernetes.io/ingress.class: {{ingressclass}}
     ingress.kubernetes.io/ssl-redirect: "false"
     nginx.ingress.kubernetes.io/ssl-redirect: "false"
-    ingress.kubernetes.io/rewrite-target: /$2
-    nginx.ingress.kubernetes.io/rewrite-target: /$2
+    ingress.kubernetes.io/rewrite-target: /{{ingressrewritetarget}}
+    nginx.ingress.kubernetes.io/rewrite-target: /{{ingressrewritetarget}}
 #  hosts:
 #    - <guid>.<region>.aksapp.io   # NOT NEEDED. SET BY SCRIPTS
 

diff --git a/Deploy/helm/image-classifier-api/templates/ingress.yaml b/Deploy/helm/image-classifier-api/templates/ingress.yaml
@@ -31,7 +31,7 @@ spec:
     - host: {{ . }}
       http:
         paths:
-          - path: {{ $ingressPath }}(/|$)(.*)
+          - path: {{ $ingressPath }}
             backend:
               serviceName: imageclassifier
               servicePort: http

diff --git a/Deploy/helm/login-api/templates/ingress.yaml b/Deploy/helm/login-api/templates/ingress.yaml
@@ -31,7 +31,7 @@ spec:
     - host: {{ . }}
       http:
         paths:
-          - path: {{ $ingressPath }}(/|$)(.*)
+          - path: {{ $ingressPath }}
             backend:
               serviceName: login
               servicePort: http

diff --git a/Deploy/helm/mobilebff/templates/ingress.yaml b/Deploy/helm/mobilebff/templates/ingress.yaml
@@ -31,7 +31,7 @@ spec:
     - host: {{ . }}
       http:
         paths:
-          - path: {{ $ingressPath }}(/|$)(.*)
+          - path: {{ $ingressPath }}
             backend:
               serviceName: mobilebff
               servicePort: http

diff --git a/Deploy/helm/popular-products-api/templates/ingress.yaml b/Deploy/helm/popular-products-api/templates/ingress.yaml
@@ -31,7 +31,7 @@ spec:
     - host: {{ . }}
       http:
         paths:
-          - path: {{ $ingressPath }}(/|$)(.*)
+          - path: {{ $ingressPath }}
             backend:
               serviceName: popularproducts
               servicePort: http

diff --git a/Deploy/helm/products-api/templates/ingress.yaml b/Deploy/helm/products-api/templates/ingress.yaml
@@ -31,7 +31,7 @@ spec:
     - host: {{ . }}
       http:
         paths:
-          - path: {{ $ingressPath }}(/|$)(.*)
+          - path: {{ $ingressPath }}
             backend:
               serviceName: product
               servicePort: http

diff --git a/Deploy/helm/profiles-api/templates/ingress.yaml b/Deploy/helm/profiles-api/templates/ingress.yaml
@@ -31,7 +31,7 @@ spec:
     - host: {{ . }}
       http:
         paths:
-          - path: {{ $ingressPath }}(/|$)(.*)
+          - path: {{ $ingressPath }}
             backend:
               serviceName: profile
               servicePort: http

diff --git a/Deploy/helm/rewards-registration-api/templates/ingress.yaml b/Deploy/helm/rewards-registration-api/templates/ingress.yaml
@@ -31,7 +31,7 @@ spec:
     - host: {{ . }}
       http:
         paths:
-          - path: {{ $ingressPath }}(/|$)(.*)
+          - path: {{ $ingressPath }}
             backend:
               serviceName: rewards-registration
               servicePort: http

diff --git a/Deploy/helm/stock-api/templates/ingress.yaml b/Deploy/helm/stock-api/templates/ingress.yaml
@@ -31,7 +31,7 @@ spec:
     - host: {{ . }}
       http:
         paths:
-          - path: {{ $ingressPath }}(/|$)(.*)
+          - path: {{ $ingressPath }}
             backend:
               serviceName: stock
               servicePort: http

diff --git a/Deploy/helm/webbff/templates/ingress.yaml b/Deploy/helm/webbff/templates/ingress.yaml
@@ -31,7 +31,7 @@ spec:
     - host: {{ . }}
       http:
         paths:
-          - path: {{ $ingressPath }}(/|$)(.*)
+          - path: {{ $ingressPath }}
             backend:
               serviceName: webbff
               servicePort: http

diff --git a/Deploy/powershell/Generate-Config.ps1 b/Deploy/powershell/Generate-Config.ps1
@@ -100,6 +100,13 @@ $tokens.appinsightsik=$appinsightsId
 $tokens.ingressclass=$ingressClass
 $tokens.secissuer="TTFakeLogin"
 $tokens.seckey="nEpLzQJGNSCNL5H6DIQCtTdNxf5VgAGcBbtXLms1YDD01KJBAs0WVawaEjn97uwB"
+$tokens.ingressrewritepath=""
+$tokens.ingressrewritetarget=""
+
+if($ingressClass -ne "addon-http-application-routing") {
+    $tokens.ingressrewritepath="(/|$)(.*)" 
+    $tokens.ingressrewritetarget="`$2"
+}
 
 Write-Host ($tokens | ConvertTo-Json) -ForegroundColor Yellow
 Write-Host "===========================================================" -ForegroundColor Yellow