From 56c7d32e2bc903032320ab537be98fed4719ebdc Mon Sep 17 00:00:00 2001
From: Galip Tolga Erdem <galiperdem@gmail.com>
Date: Wed, 9 Feb 2022 02:36:02 +0300
Subject: [PATCH] updated catalog and basket service values

---
 .../charts/basket/templates/basket-deployment.yaml   |  6 +++++-
 etc/k8s/eshoponabp/charts/basket/values.yaml         |  3 +++
 .../charts/catalog/templates/catalog-deployment.yaml |  4 ++--
 etc/k8s/eshoponabp/values.yaml                       | 12 ++++++++----
 .../Dockerfile.local                                 |  8 ++++----
 5 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/etc/k8s/eshoponabp/charts/basket/templates/basket-deployment.yaml b/etc/k8s/eshoponabp/charts/basket/templates/basket-deployment.yaml
index b057b7cc..8105cacf 100644
--- a/etc/k8s/eshoponabp/charts/basket/templates/basket-deployment.yaml
+++ b/etc/k8s/eshoponabp/charts/basket/templates/basket-deployment.yaml
@@ -44,7 +44,11 @@ spec:
         - name: "AuthServer__SwaggerClientSecret"
           value: "{{ .Values.config.swaggerClientSecret }}"
         - name: "StringEncryption__DefaultPassPhrase"
-          value: "{{ .Values.config.stringEncryptionDefaultPassPhrase }}"    
+          value: "{{ .Values.config.stringEncryptionDefaultPassPhrase }}"
+        - name: "RemoteServices__Catalog__BaseUrl"
+          value: "{{ .Values.config.remoteServices.catalogBaseUrl }}"
+        - name: "RemoteServices__Catalog__GrpcUrl"
+          value: "{{ .Values.config.remoteServices.catalogGrpcUrl }}"  
           {{- if .Values.env }}
 {{ toYaml .Values.env | indent 8 }}
           {{- end }}
diff --git a/etc/k8s/eshoponabp/charts/basket/values.yaml b/etc/k8s/eshoponabp/charts/basket/values.yaml
index c154541c..5571e666 100644
--- a/etc/k8s/eshoponabp/charts/basket/values.yaml
+++ b/etc/k8s/eshoponabp/charts/basket/values.yaml
@@ -13,6 +13,9 @@ config:
   rabbitmqHost: es-st-rabbitmq
   elasticsearchHost: es-st-elasticsearch
   stringEncryptionDefaultPassPhrase: gsKnGZ041HLL4IM8
+  remoteServices:
+    catalogBaseUrl: #
+    catalogGrpcUrl: #
 
 ingress:
   host: eshop-st-basket
diff --git a/etc/k8s/eshoponabp/charts/catalog/templates/catalog-deployment.yaml b/etc/k8s/eshoponabp/charts/catalog/templates/catalog-deployment.yaml
index 937a3593..17aef76c 100644
--- a/etc/k8s/eshoponabp/charts/catalog/templates/catalog-deployment.yaml
+++ b/etc/k8s/eshoponabp/charts/catalog/templates/catalog-deployment.yaml
@@ -45,9 +45,9 @@ spec:
         - name: "AuthServer__RequireHttpsMetadata"
           value: "{{ .Values.config.authServer.requireHttpsMetadata }}"
         - name: "AuthServer__SwaggerClientId"
-          value: "{{ .Values.config.swaggerClientId }}"
+          value: "{{ .Values.config.authServer.swaggerClientId }}"
         - name: "AuthServer__SwaggerClientSecret"
-          value: "{{ .Values.config.swaggerClientSecret }}"
+          value: "{{ .Values.config.authServer.swaggerClientSecret }}"
         - name: "StringEncryption__DefaultPassPhrase"
           value: "{{ .Values.config.stringEncryptionDefaultPassPhrase }}"
         - name: "Kestrel__Endpoints__Http__Url"
diff --git a/etc/k8s/eshoponabp/values.yaml b/etc/k8s/eshoponabp/values.yaml
index 3ea5fc64..13e44171 100644
--- a/etc/k8s/eshoponabp/values.yaml
+++ b/etc/k8s/eshoponabp/values.yaml
@@ -8,6 +8,7 @@ authserver:
       administrationService: "Host=es-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false"
       identityService: "Host=es-st-postgresdb;Port=5432;Database=EShopOnAbp_Identity;User ID=postgres;password=myPassw0rd;Pooling=false"
     dotnetEnv: Staging
+    globalizationInvariant: 0 #https://docs.microsoft.com/en-us/dotnet/core/runtime-config/globalization
     redisHost: es-st-redis
     rabbitmqHost: es-st-rabbitmq
     elasticsearchHost: es-st-elasticsearch
@@ -182,19 +183,22 @@ basket:
     redisHost: es-st-redis
     rabbitmqHost: es-st-rabbitmq
     elasticsearchHost: es-st-elasticsearch
+    remoteServices:
+      catalogBaseUrl: http://eshop-st-catalog
+      catalogGrpcUrl: http://eshop-st-catalog
   ingress:
     host: eshop-st-basket
   image:
     repository: "eshoponabp/service-basket"
     tag: latest
 
-# basket-service sub-chart override
+# catalog-service sub-chart override
 catalog:
   config:
     selfUrl: https://eshop-st-catalog
     corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public,https://eshop-st-public-web,https://eshop-st-web
     connectionStrings:
-      catalogService: "mongodb://mongodb:27017/EShopOnAbp_Catalog"
+      catalogService: "mongodb://es-st-mongodb/EShopOnAbp_Catalog"
       administrationService: "Host=es-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false"
     authServer:
       authority: http://eshop-st-authserver
@@ -206,9 +210,9 @@ catalog:
     rabbitmqHost: es-st-rabbitmq
     elasticsearchHost: es-st-elasticsearch
     kestrel:
-      httpUrl: http://eshop-st-catalog
+      httpUrl: http://eshop-st-catalog:80
       httpProtocols: Http1AndHttp2
-      grpcUrl: http://eshop-st-catalog
+      grpcUrl: http://eshop-st-catalog:81
       grpcProtocols: Http2
   ingress:
     host: eshop-st-catalog
diff --git a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Dockerfile.local b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Dockerfile.local
index 28dcb67f..1811b197 100644
--- a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Dockerfile.local
+++ b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Dockerfile.local
@@ -1,4 +1,4 @@
-  FROM mcr.microsoft.com/dotnet/aspnet:6.0
-  COPY bin/Release/net6.0/publish/ app/
-  WORKDIR /app
-  ENTRYPOINT ["dotnet", "EShopOnAbp.CatalogService.HttpApi.Host.dll"]
\ No newline at end of file
+FROM mcr.microsoft.com/dotnet/aspnet:6.0
+COPY bin/Release/net6.0/publish/ app/
+WORKDIR /app
+ENTRYPOINT ["dotnet", "EShopOnAbp.CatalogService.HttpApi.Host.dll"]
\ No newline at end of file