From e21b266dbba667ed4fda1e938564fffddc9fbbca Mon Sep 17 00:00:00 2001
From: Galip Tolga Erdem <galiperdem@gmail.com>
Date: Thu, 4 Nov 2021 10:17:14 +0300
Subject: [PATCH] updated public-web chart and removed test-connection

---
 .../charts/public-web/templates/public-web.yaml   |  4 ++++
 etc/k8s/eshoponabp/charts/public-web/values.yaml  |  9 +++------
 .../templates/tests/test-connection.yaml          | 15 ---------------
 3 files changed, 7 insertions(+), 21 deletions(-)
 delete mode 100644 etc/k8s/eshoponabp/templates/tests/test-connection.yaml

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 0f39e988..b10f35c6 100644
--- a/etc/k8s/eshoponabp/charts/public-web/templates/public-web.yaml
+++ b/etc/k8s/eshoponabp/charts/public-web/templates/public-web.yaml
@@ -21,6 +21,10 @@ spec:
         - name: https
           containerPort: 443
         env:
+        - name: App__SelfUrl
+          value: {{ .Values.config.selfUrl}} 
+        - name: RemoteServices__Default__BaseUrl
+          value: {{ .Values.config.gatewayUrl}}   
 {{ include "eshoponabp.global.env" . | indent 8 }}
        {{- if .Values.env }}
 {{ toYaml .Values.env | indent 8 }}
diff --git a/etc/k8s/eshoponabp/charts/public-web/values.yaml b/etc/k8s/eshoponabp/charts/public-web/values.yaml
index 4c7f7c88..32ea0c1a 100644
--- a/etc/k8s/eshoponabp/charts/public-web/values.yaml
+++ b/etc/k8s/eshoponabp/charts/public-web/values.yaml
@@ -1,6 +1,3 @@
-  env:
-    - name: "App__SelfUrl"
-      value: "https://eshop-st-public-web"
-    - name: "RemoteServices__Default__BaseUrl"
-      value: "http://eshop-st-gateway-public-web/"
-    
\ No newline at end of file
+config:
+  selfUrl: "https://eshop-st-public-web"
+  gatewayUrl: "http://eshop-st-gateway-public-web/"
diff --git a/etc/k8s/eshoponabp/templates/tests/test-connection.yaml b/etc/k8s/eshoponabp/templates/tests/test-connection.yaml
deleted file mode 100644
index 9ca7d87c..00000000
--- a/etc/k8s/eshoponabp/templates/tests/test-connection.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: "{{ include "eshoponabp.fullname" . }}-test-connection"
-  labels:
-    {{- include "eshoponabp.labels" . | nindent 4 }}
-  annotations:
-    "helm.sh/hook": test
-spec:
-  containers:
-    - name: wget
-      image: busybox
-      command: ['wget']
-      args: ['{{ include "eshoponabp.fullname" . }}:{{ .Values.service.port }}']
-  restartPolicy: Never