From bbdaff21b95bac40d711a2468c543e133afe4a6c Mon Sep 17 00:00:00 2001
From: selmankoc <selman.koc@volosoft.com>
Date: Tue, 7 Jun 2022 20:01:55 +0300
Subject: [PATCH] catalog and ordering cluster added

---
 .../gateway-web/templates/gateway-web-configmap.yaml | 12 ++++++++++++
 etc/k8s/eshoponabp/values.azure.yaml                 |  6 +++---
 2 files changed, 15 insertions(+), 3 deletions(-)

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 70a3c739..6a55b3b1 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
@@ -42,6 +42,18 @@ data:
           "Match": {
             "Path": "/api/setting-management/{**everything}"
           }
+        },
+        "Catalog Service": {
+          "ClusterId": "catalogCluster",
+          "Match": {
+            "Path": "/api/catalog/{**everything}"
+          }
+        },
+        "Ordering Service": {
+          "ClusterId": "orderingCluster",
+          "Match": {
+            "Path": "/api/ordering/{**everything}"
+          }
         }
       },
       "Clusters": {
diff --git a/etc/k8s/eshoponabp/values.azure.yaml b/etc/k8s/eshoponabp/values.azure.yaml
index db6e3ba9..5dddcc35 100644
--- a/etc/k8s/eshoponabp/values.azure.yaml
+++ b/etc/k8s/eshoponabp/values.azure.yaml
@@ -2,7 +2,7 @@
 authserver:
   config:
     selfUrl: https://auth.eshoponabp.com   
-    corsOrigins: https://www.gateway.eshoponabp.com,https://www.gateway-public.eshoponabp.com,https://identity.eshoponabp.com,https://administration.eshoponabp.com,https://basket.eshoponabp.com,https://catalog.eshoponabp.com,https://order.eshoponabp.com,https://payment.eshoponabp.com
+    corsOrigins: https://www.gateway.eshoponabp.com,https://www.gateway-public.eshoponabp.com,https://identity.eshoponabp.com,https://administration.eshoponabp.com,https://basket.eshoponabp.com,https://catalog.eshoponabp.com,https://order.eshoponabp.com,https://payment.eshoponabp.com,https://admin.eshoponabp.com,https://eshoponabp.com
     allowedRedirectUrls: https://admin.eshoponabp.com
     authServer:
       authority: https://auth.eshoponabp.com
@@ -145,9 +145,9 @@ gateway-web:
     administrationService:
       url: http://eshop-az-administration
     catalogService:
-      url: http://eshop-st-catalog
+      url: http://eshop-az-catalog
     orderingService:
-      url: http://eshop-st-ordering
+      url: http://eshop-az-ordering
 
 # gateway-web-public sub-chart override
 gateway-web-public: