web-gateway fix

etc/k8s/eshoponabp/charts/gateway-web/templates/gateway-web-configmap.yaml

@@ -86,6 +86,20 @@ data:
               "Address": "{{ .Values.reRoutes.administrationService.url }}"
             }
           }
+        },
+        "catalogCluster": {
+          "Destinations": {
+            "destination1": {
+              "Address": "{{ .Values.reRoutes.catalogService.url }}"
+            }
+          }
+        },
+        "orderingCluster": {
+          "Destinations": {
+            "destination1": {
+              "Address": "{{ .Values.reRoutes.orderingService.url }}"
+            }
+          }
         }
       }
     }

etc/k8s/eshoponabp/charts/gateway-web/values.yaml

@@ -19,6 +19,10 @@ reRoutes:
     url: http://eshop-st-identity
   administrationService:
     url: http://eshop-st-administration
+  catalogService:
+    url: http://eshop-st-catalog
+  orderingService:
+    url: http://eshop-st-order
 ingress:
   host: # eshop-st-gateway-web
   tlsSecret: eshop-wildcard-tls

etc/k8s/eshoponabp/charts/web/templates/web-configmap.yaml

@@ -5,24 +5,24 @@ metadata:
 data:
   dynamic-env.json: |-
     {
-    	"production": "true",
+        "production": "true",
-    	"application": {
+        "application": {
-    		"baseUrl": "{{ .Values.config.selfUrl }}",
+            "baseUrl": "{{ .Values.config.selfUrl }}",
-    		"name": "EShopOnAbp",
+            "name": "EShopOnAbp",
-    		"logoUrl": ""
+            "logoUrl": ""
-    	},
+        },
-    	"oAuthConfig": {
+        "oAuthConfig": {
-    		"issuer": "{{ .Values.config.authServer.authority }}",
+            "issuer": "{{ .Values.config.authServer.authority }}",
-    		"redirectUri": "{{ .Values.config.selfUrl }}",
+            "redirectUri": "{{ .Values.config.selfUrl }}",
-    		"requireHttps": "{{ .Values.config.authServer.requireHttpsMetadata }}",
+            "requireHttps": "{{ .Values.config.authServer.requireHttpsMetadata }}",
-    		"clientId": "Web",
+            "clientId": "Web",
-    		"responseType": "{{ .Values.config.authServer.responseType }}",
+            "responseType": "{{ .Values.config.authServer.responseType }}",
-    		"scope": "offline_access openid profile email phone AccountService IdentityService AdministrationService CatalogService OrderingService"
+            "scope": "offline_access openid profile email phone AccountService IdentityService AdministrationService CatalogService OrderingService"
-    	},
+        },
-    	"apis": {
+        "apis": {
-    		"default": {
+            "default": {
-    			"url": "{{ .Values.config.gatewayUrl }}",
+                "url": "{{ .Values.config.gatewayUrl }}",
-    			"rootNamespace": "EShopOnAbp"
+                "rootNamespace": "EShopOnAbp"
-    		}
+            }
-    	}
+        }
     }

etc/k8s/eshoponabp/charts/web/templates/web-deployment.yaml

@@ -22,7 +22,7 @@ spec:
           containerPort: 443
         volumeMounts:
         - name: config-volume
-          mountPath: /app/dynamic-env.json
+          mountPath: /usr/share/nginx/html/dynamic-env.json
           subPath: dynamic-env.json
         env:
           {{- if .Values.env }}

etc/k8s/eshoponabp/values.azure.yaml

@@ -25,8 +25,7 @@ authserver:
 web:
   config:
     selfUrl: https://admin.eshoponabp.com
-    # gatewayUrl: http://eshop-az-gateway-web 
+    gatewayUrl: https://www.gateway.eshoponabp.com
-    gatewayUrl: https://www.gateway.eshoponabp.com/
     authServer:
       authority: https://auth.eshoponabp.com
       requireHttpsMetadata: "false"
@@ -35,7 +34,7 @@ web:
     host: admin.eshoponabp.com
   image:
     repository: "volocr.azurecr.io/eshoponabp/app-web"
-    tag: 1
+    tag: latest
 
 # public-web sub-chart override
 public-web:
@@ -145,6 +144,10 @@ gateway-web:
       url: http://eshop-az-identity
     administrationService:
       url: http://eshop-az-administration
+    catalogService:
+      url: http://eshop-st-catalog
+    orderingService:
+      url: http://eshop-st-ordering
 
 # gateway-web-public sub-chart override
 gateway-web-public: