From eafda9acc1619c609b601003dcf4925607a6dbc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Go=CC=88khan=20S=CC=A7engu=CC=88n?= <gokhansengun@gmail.com>
Date: Tue, 19 Oct 2021 15:28:20 +0300
Subject: [PATCH] Update consul config

---
 etc/k8s/deploy-staging.ps1                                  | 2 +-
 .../charts/administration/templates/administration.yaml     | 6 ++++--
 etc/k8s/eshoponabp/charts/identity/templates/identity.yaml  | 2 +-
 etc/k8s/eshoponabp/charts/saas/templates/saas.yaml          | 2 +-
 etc/k8s/eshoponabp/templates/_helpers.tpl                   | 4 +++-
 etc/k8s/eshoponabp/values.yaml                              | 6 ++++++
 6 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/etc/k8s/deploy-staging.ps1 b/etc/k8s/deploy-staging.ps1
index 458642a7..ad6e28ce 100644
--- a/etc/k8s/deploy-staging.ps1
+++ b/etc/k8s/deploy-staging.ps1
@@ -1,3 +1,3 @@
 param ($version='latest')
 
-helm upgrade --install eshoponabp eshoponabp --namespace eshop --create-namespace --set global.eventHubImageVersion=$version
\ No newline at end of file
+helm upgrade --install eshoponabp eshoponabp --namespace eshop --create-namespace --set global.eshoponabpImageVersion=$version
\ No newline at end of file
diff --git a/etc/k8s/eshoponabp/charts/administration/templates/administration.yaml b/etc/k8s/eshoponabp/charts/administration/templates/administration.yaml
index 83b23304..387b49d0 100644
--- a/etc/k8s/eshoponabp/charts/administration/templates/administration.yaml
+++ b/etc/k8s/eshoponabp/charts/administration/templates/administration.yaml
@@ -12,7 +12,7 @@ spec:
         app: {{ .Release.Name }}-{{ .Chart.Name }}
     spec:
       containers:
-      - image: {{ .Values.global.administrationService.containerImage }}:{{ .Values.global.eventHubImageVersion }}
+      - image: {{ .Values.global.administrationService.containerImage }}:{{ .Values.global.eshoponabpImageVersion }}
         imagePullPolicy: {{ .Values.global.imagePullPolicy }}
         name: {{ .Release.Name }}-{{ .Chart.Name }}
         ports:
@@ -26,4 +26,6 @@ spec:
           value: {{ .Values.global.administrationService.connString }}
         - name: "ConnectionStrings__SaasService"
           value: {{ .Values.global.saasService.connString }}  
-
+          {{- if .Values.env }}
+{{ toYaml .Values.env | indent 8 }}
+          {{- end }}
diff --git a/etc/k8s/eshoponabp/charts/identity/templates/identity.yaml b/etc/k8s/eshoponabp/charts/identity/templates/identity.yaml
index ba929514..89128bd8 100644
--- a/etc/k8s/eshoponabp/charts/identity/templates/identity.yaml
+++ b/etc/k8s/eshoponabp/charts/identity/templates/identity.yaml
@@ -12,7 +12,7 @@ spec:
         app: {{ .Release.Name }}-{{ .Chart.Name }}
     spec:
       containers:
-      - image: {{ .Values.global.identityService.containerImage }}:{{ .Values.global.eventHubImageVersion }}
+      - image: {{ .Values.global.identityService.containerImage }}:{{ .Values.global.eshoponabpImageVersion }}
         imagePullPolicy: {{ .Values.global.imagePullPolicy }}
         name: {{ .Release.Name }}-{{ .Chart.Name }}
         ports:
diff --git a/etc/k8s/eshoponabp/charts/saas/templates/saas.yaml b/etc/k8s/eshoponabp/charts/saas/templates/saas.yaml
index e0ee1297..58845209 100644
--- a/etc/k8s/eshoponabp/charts/saas/templates/saas.yaml
+++ b/etc/k8s/eshoponabp/charts/saas/templates/saas.yaml
@@ -12,7 +12,7 @@ spec:
         app: {{ .Release.Name }}-{{ .Chart.Name }}
     spec:
       containers:
-      - image: {{ .Values.global.saasService.containerImage }}:{{ .Values.global.eventHubImageVersion }}
+      - image: {{ .Values.global.saasService.containerImage }}:{{ .Values.global.eshoponabpImageVersion }}
         imagePullPolicy: {{ .Values.global.imagePullPolicy }}
         name: {{ .Release.Name }}-{{ .Chart.Name }}
         ports:
diff --git a/etc/k8s/eshoponabp/templates/_helpers.tpl b/etc/k8s/eshoponabp/templates/_helpers.tpl
index 80649639..c9dd2693 100644
--- a/etc/k8s/eshoponabp/templates/_helpers.tpl
+++ b/etc/k8s/eshoponabp/templates/_helpers.tpl
@@ -75,5 +75,7 @@ Create the name of the service account to use
 - name: "StringEncryption__DefaultPassPhrase"
   value: "{{ .Values.global.stringEncryptionDefaultPassPhrase }}"
 - name: "RabbitMQ__Connections__Default__HostName"
-  value: "{{ .Values.global.rabbitMqHostName }}"  
+  value: "{{ .Values.global.rabbitMqHostName }}"
+- name: "Consul__Host"
+  value: "{{ .Values.global.consulHostname }}"
 {{- end }}
diff --git a/etc/k8s/eshoponabp/values.yaml b/etc/k8s/eshoponabp/values.yaml
index e8ac782c..16d8a212 100644
--- a/etc/k8s/eshoponabp/values.yaml
+++ b/etc/k8s/eshoponabp/values.yaml
@@ -10,6 +10,11 @@ image:
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
 
+administration:
+  env:
+    # - name: "ADMIN_SPECIFIC_ENV_NAME"
+    #   value: "ADMIN_SPECIFIC_ENV_VALUE"
+
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
@@ -115,6 +120,7 @@ global:
     containerImage: "eshoponabp/gateway-publicweb"
   redisConfiguration: "eshoponabp-redis"
   rabbitMqHostName: "eshoponabp-rabbitmq"
+  consulHostname: "http://eshoponabp-consul"
   nginxProxyBufferSize: "32k"
   nginxProxyBuffersNumber: "8"
   internalAuthServerAuthority: "http://eshoponabp-authserver"