From 10b4b2fe87f6c7bcf81e10769e7e910a1900b17f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ba=C5=9Fak=20ERDEM?= <galiperdem@gmail.com>
Date: Sun, 24 Oct 2021 03:08:02 +0300
Subject: [PATCH] public-web fixed gateway http request

---
 etc/k8s/eshoponabp/charts/public-web/templates/public-web.yaml | 2 --
 etc/k8s/eshoponabp/charts/public-web/values.yaml               | 2 +-
 etc/k8s/eshoponabp/charts/public-webgateway/values.yaml        | 2 +-
 etc/k8s/eshoponabp/values.yaml                                 | 3 +--
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/etc/k8s/eshoponabp/charts/public-web/templates/public-web.yaml b/etc/k8s/eshoponabp/charts/public-web/templates/public-web.yaml
index c289f731..0f39e988 100644
--- a/etc/k8s/eshoponabp/charts/public-web/templates/public-web.yaml
+++ b/etc/k8s/eshoponabp/charts/public-web/templates/public-web.yaml
@@ -22,8 +22,6 @@ spec:
           containerPort: 443
         env:
 {{ include "eshoponabp.global.env" . | indent 8 }}
-        - name: "RemoteServices__Default__BaseUrl"
-          value: {{ .Values.global.publicWeb.remoteServiceUrl }}
        {{- if .Values.env }}
 {{ toYaml .Values.env | indent 8 }}
           {{- end }}
\ No newline at end of file
diff --git a/etc/k8s/eshoponabp/charts/public-web/values.yaml b/etc/k8s/eshoponabp/charts/public-web/values.yaml
index f57d8644..4ba89c78 100644
--- a/etc/k8s/eshoponabp/charts/public-web/values.yaml
+++ b/etc/k8s/eshoponabp/charts/public-web/values.yaml
@@ -2,5 +2,5 @@
     - name: "App__SelfUrl"
       value: "https://eshoponabp-public-web"
     - name: "RemoteServices__Default__BaseUrl"
-      value: "https://eshoponabp-public-webgateway/"
+      value: "http://eshoponabp-public-webgateway/"
     
\ No newline at end of file
diff --git a/etc/k8s/eshoponabp/charts/public-webgateway/values.yaml b/etc/k8s/eshoponabp/charts/public-webgateway/values.yaml
index ec2ae333..9fe11c70 100644
--- a/etc/k8s/eshoponabp/charts/public-webgateway/values.yaml
+++ b/etc/k8s/eshoponabp/charts/public-webgateway/values.yaml
@@ -2,7 +2,7 @@
     - name: "App__SelfUrl"
       value: "https://eshoponabp-public-webgateway"
     - name: "GlobalConfiguration__BaseUrl"
-      value: "https://eshoponabp-public-webgateway"  
+      value: "http://eshoponabp-public-webgateway"  
     - name: "Routes__0__DownstreamScheme"
       value: "http"  
     - name: "Routes__0__DownstreamHostAndPorts__0__Host"
diff --git a/etc/k8s/eshoponabp/values.yaml b/etc/k8s/eshoponabp/values.yaml
index 47bded3a..936ec146 100644
--- a/etc/k8s/eshoponabp/values.yaml
+++ b/etc/k8s/eshoponabp/values.yaml
@@ -94,7 +94,6 @@ global:
     domain:  eshoponabp-public-web
     url: https://eshoponabp-public-web
     containerImage: "eshoponabp/app-publicweb"
-    remoteServiceUrl: http://eshoponabp-public-webgateway
   authServer:
     domain: eshoponabp-authserver
     url: https://eshoponabp-authserver
@@ -116,7 +115,7 @@ global:
     connString: "Server=eshoponabp-sqldb,1433;Database=EShopOnAbp_Saas;User Id=sa;password=myPassw@rd;MultipleActiveResultSets=true"
   publicWebGateway:
     domain:  eshoponabp-public-webgateway
-    url: http://eshoponabp-public-webgateway
+    url: https://eshoponabp-public-webgateway
     containerImage: "eshoponabp/gateway-publicweb"
   redisConfiguration: "eshoponabp-redis"
   rabbitMqHostName: "eshoponabp-rabbitmq"