Final adjustments to make envoy work with ingress and remove Polly from http calls

Author: eiximenis

k8s/gen-k8s-env-aks.ps1

@@ -4,9 +4,12 @@
     [parameter(Mandatory=$true)][string]$serviceName,
     [parameter(Mandatory=$true)][string]$dnsNamePrefix,
     [parameter(Mandatory=$false)][string]$registryName,
-    [parameter(Mandatory=$true)][string]$createAcr=$true,
+    [parameter(Mandatory=$true)][bool]$createAcr=$true,
     [parameter(Mandatory=$false)][int]$nodeCount=3,
-    [parameter(Mandatory=$false)][string]$nodeVMSize="Standard_D2_v2"
+    [parameter(Mandatory=$false)][string]$nodeVMSize="Standard_D2_v2",
+    [parameter(Mandatory=$false)][bool]$enableHttpApplicationAddon=$true,
+    [parameter(Mandatory=$false)][bool]$enableAzureMonitoring=$false,
+    [parameter(Mandatory=$false)][ValidateSet("VirtualMachineScaleSets","AvailabilitySet",IgnoreCase=$true)]$vmSetType="VirtualMachineScaleSets"
 )
 
 # Create resource group
@@ -15,20 +18,33 @@ az group create --name=$resourceGroupName --location=$location
 
 if ($createAcr -eq $true) {
     # Create Azure Container Registry
-    Write-Host "Creating Azure Container Registry..." -ForegroundColor Yellow
+    if ([string]::IsNullOrEmpty($registryName)) {
+        $registryName=$serviceName
+    }
+    Write-Host "Creating Azure Container Registry named $registryName" -ForegroundColor Yellow
     az acr create -n $registryName -g $resourceGroupName -l $location  --admin-enabled true --sku Basic
 }
 
 # Create kubernetes cluster in AKS
-Write-Host "Creating Kubernetes cluster in AKS..." -ForegroundColor Yellow
-az aks create --resource-group=$resourceGroupName --name=$serviceName --dns-name-prefix=$dnsNamePrefix --generate-ssh-keys --node-count=$nodeCount --node-vm-size=$nodeVMSize
+Write-Host "Creating AKS $resourceGroupName/$serviceName" -ForegroundColor Yellow
+az aks create --resource-group=$resourceGroupName --name=$serviceName --dns-name-prefix=$dnsNamePrefix --generate-ssh-keys --node-count=$nodeCount --node-vm-size=$nodeVMSize --vm-set-type $vmSetType
+
+if ($enableHttpApplicationAddon) {
+    Write-Host "Enabling Http Applciation Routing in AKS $serviceName" -ForegroundColor Yellow
+    az aks enable-addons --resource-group $resourceGroupName --name $serviceName --addons http_application_routing
+}
+
+if ($enableAzureMonitoring) {
+    Write-Host "Enabling Azure Monitoring in AKS $serviceName" -ForegroundColor Yellow
+    az aks enable-addons --resource-group $resourceGroupName --name $serviceName --addons monitoring
+}
 
 # Retrieve kubernetes cluster configuration and save it under ~/.kube/config
 Write-Host "Getting Kubernetes config..." -ForegroundColor Yellow
 az aks get-credentials --resource-group=$resourceGroupName --name=$serviceName
 
 if ($createAcr -eq $true) {
     # Show ACR credentials
-    Write-Host "ACR credentials" -ForegroundColor Yellow
+    Write-Host "ACR $registryName credentials:" -ForegroundColor Yellow
     az acr credential show -n $registryName
 }

k8s/gen-k8s-env.ps1

@@ -23,17 +23,39 @@ static_resources:
               domains:
               - "*"
               routes:
-              - match:
+              - name: "m-short"
+                match:
                   prefix: "/m/"
                 route:
+                  auto_host_rewrite: true
                   prefix_rewrite: "/marketing-api/"
                   cluster: marketing
-              - match:
+              - name: "m-long"
+                match:
                   prefix: "/marketing-api/"
                 route:
+                  auto_host_rewrite: true
                   cluster: marketing
           http_filters:
-          - name: envoy.router            
+          - name: envoy.router  
+          access_log:
+          - name: envoy.file_access_log
+            filter:
+              not_health_check_filter: {}          
+            config:
+              json_format:
+                time: "%START_TIME%"
+                protocol: "%PROTOCOL%"
+                duration: "%DURATION%"
+                request_method: "%REQ(:METHOD)%"  
+                request_host: "%REQ(HOST)%"  
+                path: "%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%" 
+                response_flags: "%RESPONSE_FLAGS%"
+                route_name: "%ROUTE_NAME%"
+                upstream_host: "%UPSTREAM_HOST%"
+                upstream_cluster: "%UPSTREAM_CLUSTER%"
+                upstream_local_address: "%UPSTREAM_LOCAL_ADDRESS%"    
+              path: "/tmp/access.log"                 
   clusters:
   - name: marketing
     connect_timeout: 0.25s

k8s/helm/apigwmm/envoy.yaml

@@ -23,68 +23,100 @@ static_resources:
               domains:
               - "*"
               routes:
-              - match:
+              - name: "c-short"
+                match:
                   prefix: "/c/"
                 route:
+                  auto_host_rewrite: true
                   prefix_rewrite: "/catalog-api/"
                   cluster: catalog
-              - match:
+              - name: "c-long"
+                match:
                   prefix: "/catalog-api/"
                 route:
+                  auto_host_rewrite: true
                   cluster: catalog
-              - match:
+              - name: "o-short"
+                match:
                   prefix: "/o/"
                 route:
+                  auto_host_rewrite: true
                   prefix_rewrite: "/ordering-api/"
                   cluster: ordering 
-              - match:
+              - name: "o-long"
+                match:
                   prefix: "/ordering-api/"
                 route:
+                  auto_host_rewrite: true
                   cluster: ordering                  
-              - match:
+              - name: "b-short"
+                match:
                   prefix: "/b/"
                 route:
+                  auto_host_rewrite: true
                   prefix_rewrite: "/basket-api/"
                   cluster: basket
-              - match:
+              - name: "b-long"
+                match:
                   prefix: "/basket-api/"
                 route:
+                  auto_host_rewrite: true
                   cluster: basket                  
-              - match:
+              - name: "agg"
+                match:
                   prefix: "/"
                 route:
+                  auto_host_rewrite: true
                   prefix_rewrite: "/"
                   cluster: shoppingagg
           http_filters:
           - name: envoy.router            
+          access_log:
+          - name: envoy.file_access_log
+            filter:
+              not_health_check_filter: {}          
+            config:
+              json_format:
+                time: "%START_TIME%"
+                protocol: "%PROTOCOL%"
+                duration: "%DURATION%"
+                request_method: "%REQ(:METHOD)%"  
+                request_host: "%REQ(HOST)%"  
+                path: "%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%" 
+                response_flags: "%RESPONSE_FLAGS%"
+                route_name: "%ROUTE_NAME%"
+                upstream_host: "%UPSTREAM_HOST%"
+                upstream_cluster: "%UPSTREAM_CLUSTER%"
+                upstream_local_address: "%UPSTREAM_LOCAL_ADDRESS%"    
+              path: "/tmp/access.log"         
   clusters:
   - name: shoppingagg
     connect_timeout: 0.25s
-    type: logical_dns
+    type: strict_dns
     lb_policy: round_robin
     hosts:
     - socket_address:
         address: webshoppingagg
         port_value: 80
   - name: catalog
     connect_timeout: 0.25s
-    type: logical_dns
+    type: strict_dns
     lb_policy: round_robin
     hosts:
     - socket_address:
         address: catalog-api
         port_value: 80
   - name: basket
     connect_timeout: 0.25s
-    type: logical_dns
+    type: strict_dns
     lb_policy: round_robin
     hosts:
     - socket_address:
         address: basket-api
         port_value: 80        
   - name: ordering
     connect_timeout: 0.25s
-    type: logical_dns
+    type: strict_dns
     lb_policy: round_robin
     hosts:
     - socket_address:

k8s/helm/apigwms/envoy.yaml

@@ -23,29 +23,51 @@ static_resources:
               domains:
               - "*"
               routes:
-              - match:
+              - name: "m-short"
+                match:
                   prefix: "/m/"
                 route:
+                  auto_host_rewrite: true
                   prefix_rewrite: "/marketing-api/"
                   cluster: marketing
-              - match:
+              - name: "m-long"
+                match:
                   prefix: "/marketing-api/"
                 route:
+                  auto_host_rewrite: true
                   cluster: marketing
           http_filters:
-          - name: envoy.router            
+          - name: envoy.router      
+          access_log:
+          - name: envoy.file_access_log
+            filter:
+              not_health_check_filter: {}          
+            config:
+              json_format:
+                time: "%START_TIME%"
+                protocol: "%PROTOCOL%"
+                duration: "%DURATION%"
+                request_method: "%REQ(:METHOD)%"  
+                request_host: "%REQ(HOST)%"  
+                path: "%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%" 
+                response_flags: "%RESPONSE_FLAGS%"
+                route_name: "%ROUTE_NAME%"
+                upstream_host: "%UPSTREAM_HOST%"
+                upstream_cluster: "%UPSTREAM_CLUSTER%"
+                upstream_local_address: "%UPSTREAM_LOCAL_ADDRESS%"     
+              path: "/tmp/access.log"
   clusters:
   - name: marketing
     connect_timeout: 0.25s
-    type: logical_dns
+    type: strict_dns
     lb_policy: round_robin
     hosts:
     - socket_address:
         address: marketing-api
         port_value: 80
   - name: locations
     connect_timeout: 0.25s
-    type: logical_dns
+    type: strict_dns
     lb_policy: round_robin
     hosts:
     - socket_address:

k8s/helm/apigwwm/envoy.yaml

@@ -1,4 +1,4 @@
-ç{{- if .Values.ingress.enabled -}}
+{{- if .Values.ingress.enabled -}}
 {{- $ingressPath := include "pathBase" . -}}
 {{- $serviceName := .Values.app.svc.webmarketingapigw -}}