From efbf37a8b6c8efb849af0bdedb8ab3841114710f Mon Sep 17 00:00:00 2001
From: Galip Tolga Erdem <galiperdem@gmail.com>
Date: Fri, 25 Feb 2022 12:49:13 +0300
Subject: [PATCH] updated helm chart values for gateways with account service
 re-route

---
 .../templates/gateway-web-public-configmap.yaml        | 10 +++++-----
 .../eshoponabp/charts/gateway-web-public/values.yaml   |  4 ++++
 .../gateway-web/templates/gateway-web-configmap.yaml   |  8 ++++----
 etc/k8s/eshoponabp/charts/gateway-web/values.yaml      |  4 ++++
 etc/k8s/eshoponabp/values.yaml                         |  4 ++++
 5 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/etc/k8s/eshoponabp/charts/gateway-web-public/templates/gateway-web-public-configmap.yaml b/etc/k8s/eshoponabp/charts/gateway-web-public/templates/gateway-web-public-configmap.yaml
index 27301408..063c415f 100644
--- a/etc/k8s/eshoponabp/charts/gateway-web-public/templates/gateway-web-public-configmap.yaml
+++ b/etc/k8s/eshoponabp/charts/gateway-web-public/templates/gateway-web-public-configmap.yaml
@@ -10,13 +10,13 @@ data:
     },
       "Routes": [   
     {
-      "ServiceKey": "Identity Service",
+      "ServiceKey": "Account Service",
       "DownstreamPathTemplate": "/api/account/{everything}",
-      "DownstreamScheme": "{{ .Values.reRoutes.identityService.schema }}",
+      "DownstreamScheme": "{{ .Values.reRoutes.accountService.schema }}",
       "DownstreamHostAndPorts": [
         {
-          "Host": "{{ .Values.reRoutes.identityService.host }}",
-          "Port": {{ .Values.reRoutes.identityService.port }}
+          "Host": "{{ .Values.reRoutes.accountService.host }}",
+          "Port": {{ .Values.reRoutes.accountService.port }}
         }
       ],
       "UpstreamPathTemplate": "/api/account/{everything}",
@@ -45,7 +45,7 @@ data:
           "Port": "{{ .Values.reRoutes.catalogService.port }}",
         }
       ],
-      "UpstreamPathTemplate": "/api/catalog/{everything}",
+      "UpstreamPathTemplate": "/api/c/catalog/{everything}",
       "UpstreamHttpMethod": [ "Put", "Delete", "Get", "Post" ]
     },
     {
diff --git a/etc/k8s/eshoponabp/charts/gateway-web-public/values.yaml b/etc/k8s/eshoponabp/charts/gateway-web-public/values.yaml
index 002e5667..745f8d01 100644
--- a/etc/k8s/eshoponabp/charts/gateway-web-public/values.yaml
+++ b/etc/k8s/eshoponabp/charts/gateway-web-public/values.yaml
@@ -13,6 +13,10 @@ config:
   stringEncryptionDefaultPassPhrase: gsKnGZ041HLL4IM8
 
 reRoutes:
+  accountService:
+    schema: http
+    host: eshop-st-authserver
+    port: 80
   identityService:
     schema: http
     host: eshop-st-identity
diff --git a/etc/k8s/eshoponabp/charts/gateway-web/templates/gateway-web-configmap.yaml b/etc/k8s/eshoponabp/charts/gateway-web/templates/gateway-web-configmap.yaml
index ec349914..52e6bd5e 100644
--- a/etc/k8s/eshoponabp/charts/gateway-web/templates/gateway-web-configmap.yaml
+++ b/etc/k8s/eshoponabp/charts/gateway-web/templates/gateway-web-configmap.yaml
@@ -23,13 +23,13 @@ data:
       "UpstreamHttpMethod": [ "Put", "Delete", "Get", "Post" ]
     },
     {
-      "ServiceKey": "Identity Service",
+      "ServiceKey": "Account Service",
       "DownstreamPathTemplate": "/api/account/{everything}",
-      "DownstreamScheme": "{{ .Values.reRoutes.identityService.schema }}",
+      "DownstreamScheme": "{{ .Values.reRoutes.accountService.schema }}",
       "DownstreamHostAndPorts": [
         {
-          "Host": "{{ .Values.reRoutes.identityService.host }}",
-          "Port": {{ .Values.reRoutes.identityService.port }}
+          "Host": "{{ .Values.reRoutes.accountService.host }}",
+          "Port": {{ .Values.reRoutes.accountService.port }}
         }
       ],
       "UpstreamPathTemplate": "/api/account/{everything}",
diff --git a/etc/k8s/eshoponabp/charts/gateway-web/values.yaml b/etc/k8s/eshoponabp/charts/gateway-web/values.yaml
index a80b0b01..66d13b0b 100644
--- a/etc/k8s/eshoponabp/charts/gateway-web/values.yaml
+++ b/etc/k8s/eshoponabp/charts/gateway-web/values.yaml
@@ -13,6 +13,10 @@ config:
   elasticsearchHost: #
   stringEncryptionDefaultPassPhrase: gsKnGZ041HLL4IM8
 reRoutes:
+  accountService:
+    schema: http
+    host: eshop-st-authserver
+    port: 80
   identityService:
     schema: http
     host: eshop-st-identity
diff --git a/etc/k8s/eshoponabp/values.yaml b/etc/k8s/eshoponabp/values.yaml
index ab84ca38..7560543a 100644
--- a/etc/k8s/eshoponabp/values.yaml
+++ b/etc/k8s/eshoponabp/values.yaml
@@ -160,6 +160,10 @@ gateway-web-public:
     repository: "eshoponabp/gateway-web-public"
     tag: latest
   reRoutes:
+    accountService:
+      schema: http
+      host: eshop-st-authserver
+      port: 80
     identityService:
       schema: http
       host: eshop-st-identity