From 5087d9850d43c3d81f6a3547006844207c2aff35 Mon Sep 17 00:00:00 2001
From: selmankoc <selman.koc@volosoft.com>
Date: Mon, 6 Jun 2022 16:26:47 +0300
Subject: [PATCH] fix grcp

---
 .../charts/catalog/templates/catalog-deployment.yaml         | 1 +
 .../eshoponabp/charts/catalog/templates/catalog-service.yaml | 2 ++
 .../charts/public-web/templates/public-web-deployment.yaml   | 2 ++
 etc/k8s/eshoponabp/charts/public-web/values.yaml             | 1 +
 etc/k8s/eshoponabp/values.azure.yaml                         | 5 +++--
 5 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/etc/k8s/eshoponabp/charts/catalog/templates/catalog-deployment.yaml b/etc/k8s/eshoponabp/charts/catalog/templates/catalog-deployment.yaml
index a057014e..e66bd8ab 100644
--- a/etc/k8s/eshoponabp/charts/catalog/templates/catalog-deployment.yaml
+++ b/etc/k8s/eshoponabp/charts/catalog/templates/catalog-deployment.yaml
@@ -18,6 +18,7 @@ spec:
         ports:
         - name: http
           containerPort: 80
+          protocol: TCP
         - name: grpc
           containerPort: 81
           protocol: TCP
diff --git a/etc/k8s/eshoponabp/charts/catalog/templates/catalog-service.yaml b/etc/k8s/eshoponabp/charts/catalog/templates/catalog-service.yaml
index 28306a83..eae17053 100644
--- a/etc/k8s/eshoponabp/charts/catalog/templates/catalog-service.yaml
+++ b/etc/k8s/eshoponabp/charts/catalog/templates/catalog-service.yaml
@@ -8,6 +8,8 @@ spec:
   ports:
     - name: "http"
       port: 80
+      targetPort: http
+      protocol: TCP
     - name: grpc
       targetPort: grpc
       protocol: TCP
diff --git a/etc/k8s/eshoponabp/charts/public-web/templates/public-web-deployment.yaml b/etc/k8s/eshoponabp/charts/public-web/templates/public-web-deployment.yaml
index 3519d65c..a6202ab9 100644
--- a/etc/k8s/eshoponabp/charts/public-web/templates/public-web-deployment.yaml
+++ b/etc/k8s/eshoponabp/charts/public-web/templates/public-web-deployment.yaml
@@ -39,6 +39,8 @@ spec:
           value: "{{ .Values.config.rabbitmqHost }}"
         - name: "ElasticSearch__Url"
           value: "{{ .Values.config.elasticsearchHost }}"
+        - name: "ReverseProxy__Clusters__cluster1__Destinations__destination1__Address"
+          value: "{{ .Values.config.gatewayUrl  }}" 
           {{- 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 390281e2..12e3ab42 100644
--- a/etc/k8s/eshoponabp/charts/public-web/values.yaml
+++ b/etc/k8s/eshoponabp/charts/public-web/values.yaml
@@ -9,6 +9,7 @@ config:
   rabbitmqHost: eshop-st-rabbitmq
   elasticsearchHost: eshop-st-elasticsearch
   stringEncryptionDefaultPassPhrase: gsKnGZ041HLL4IM8
+  
 
 ingress:
   host: eshop-st-public-web
diff --git a/etc/k8s/eshoponabp/values.azure.yaml b/etc/k8s/eshoponabp/values.azure.yaml
index e71a095b..b8b18a69 100644
--- a/etc/k8s/eshoponabp/values.azure.yaml
+++ b/etc/k8s/eshoponabp/values.azure.yaml
@@ -44,6 +44,7 @@ public-web:
     redisHost: eshop-az-redis
     rabbitmqHost: eshop-az-rabbitmq
     elasticsearchHost: eshop-az-elasticsearch
+    
   ingress:
     host: eshoponabp.com
   image:
@@ -191,8 +192,8 @@ basket:
     rabbitmqHost: eshop-az-rabbitmq
     elasticsearchHost: eshop-az-elasticsearch
     remoteServices:
-      catalogBaseUrl: http://eshop-az-catalog
-      catalogGrpcUrl: http://eshop-az-catalog
+      catalogBaseUrl: http://eshop-az-catalog:80
+      catalogGrpcUrl: http://eshop-az-catalog:81
   ingress:
     host: basket.eshoponabp.com
   image: