From 60f422076b45e88d9ad730146c13bc30239d6b3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Fri, 6 Aug 2021 10:27:07 +0300
Subject: [PATCH] Revisit naming

---
 .../account/templates/account-ingress.yaml    |  4 ++--
 .../charts/api/templates/api-ingress.yaml     |  2 +-
 .../charts/dbmigrator/templates/migrator.yaml |  6 +++---
 .../charts/www/templates/www-ingress.yaml     |  4 ++--
 .../eventhub/templates/_helpers.tpl           | 10 +++++-----
 etc/k8s/helm-chart/eventhub/values.yaml       | 20 +++++++++----------
 6 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/etc/k8s/helm-chart/eventhub/charts/account/templates/account-ingress.yaml b/etc/k8s/helm-chart/eventhub/charts/account/templates/account-ingress.yaml
index 2e206c2..7180782 100644
--- a/etc/k8s/helm-chart/eventhub/charts/account/templates/account-ingress.yaml
+++ b/etc/k8s/helm-chart/eventhub/charts/account/templates/account-ingress.yaml
@@ -12,10 +12,10 @@ metadata:
 spec:
   tls:
   - hosts:
-      - {{ .Values.global.accountUrl }}
+      - {{ .Values.global.accountDomain }}
     secretName: {{ .Release.Name }}-{{ .Chart.Name }}-tls
   rules:
-  - host: "{{ .Values.global.accountUrl }}"
+  - host: "{{ .Values.global.accountDomain }}"
     http:
       paths:
       - path: /
diff --git a/etc/k8s/helm-chart/eventhub/charts/api/templates/api-ingress.yaml b/etc/k8s/helm-chart/eventhub/charts/api/templates/api-ingress.yaml
index e2165ba..d2d7fcb 100644
--- a/etc/k8s/helm-chart/eventhub/charts/api/templates/api-ingress.yaml
+++ b/etc/k8s/helm-chart/eventhub/charts/api/templates/api-ingress.yaml
@@ -9,7 +9,7 @@ metadata:
     nginx.ingress.kubernetes.io/proxy-buffers-number: "{{ .Values.global.nginxProxyBuffersNumber }}"
 spec:
   rules:
-  - host: "{{ .Values.global.apiUrl }}"
+  - host: "{{ .Values.global.apiDomain }}"
     http:
       paths:
       - path: /
diff --git a/etc/k8s/helm-chart/eventhub/charts/dbmigrator/templates/migrator.yaml b/etc/k8s/helm-chart/eventhub/charts/dbmigrator/templates/migrator.yaml
index 38560d5..199cbc4 100644
--- a/etc/k8s/helm-chart/eventhub/charts/dbmigrator/templates/migrator.yaml
+++ b/etc/k8s/helm-chart/eventhub/charts/dbmigrator/templates/migrator.yaml
@@ -15,10 +15,10 @@ spec:
         - name: "ConnectionStrings__Default"
           value: {{ .Values.global.defaultConnString }}
         - name: "IdentityServer__Clients__EventHub_Web__RootUrl"
-          value: {{ .Values.global.wwwUrlFull }}
+          value: {{ .Values.global.wwwUrl }}
         - name: "IdentityServer__Clients__EventHub_Blazor__RootUrl"
-          value: {{ .Values.global.adminUrlFull }}
+          value: {{ .Values.global.adminUrl }}
         - name: "IdentityServer__Clients__EventHub_Swagger__RootUrl"
-          value: {{ .Values.global.apiUrlFull }}
+          value: {{ .Values.global.apiUrl }}
       restartPolicy: Never
   backoffLimit: 4
\ No newline at end of file
diff --git a/etc/k8s/helm-chart/eventhub/charts/www/templates/www-ingress.yaml b/etc/k8s/helm-chart/eventhub/charts/www/templates/www-ingress.yaml
index 01633be..ab6739f 100644
--- a/etc/k8s/helm-chart/eventhub/charts/www/templates/www-ingress.yaml
+++ b/etc/k8s/helm-chart/eventhub/charts/www/templates/www-ingress.yaml
@@ -10,10 +10,10 @@ metadata:
 spec:
   tls:
   - hosts:
-      - {{ .Values.global.wwwUrl }}
+      - {{ .Values.global.wwwDomain }}
     secretName: {{ .Release.Name }}-{{ .Chart.Name }}-tls
   rules:
-  - host: "{{ .Values.global.wwwUrl }}"
+  - host: "{{ .Values.global.wwwDomain }}"
     http:
       paths:
       - path: /
diff --git a/etc/k8s/helm-chart/eventhub/templates/_helpers.tpl b/etc/k8s/helm-chart/eventhub/templates/_helpers.tpl
index f908b84..91bcc62 100644
--- a/etc/k8s/helm-chart/eventhub/templates/_helpers.tpl
+++ b/etc/k8s/helm-chart/eventhub/templates/_helpers.tpl
@@ -1,14 +1,14 @@
 {{- define "eventhub.global.env" -}}
 - name: "AppUrls__Account"
-  value: "{{ .Values.global.accountUrlFull }}"
+  value: "{{ .Values.global.accountUrl }}"
 - name: "AppUrls__Www"
-  value: "{{ .Values.global.wwwUrlFull }}"
+  value: "{{ .Values.global.wwwUrl }}"
 - name: "AppUrls__Api"
-  value: "{{ .Values.global.apiUrlFull }}"
+  value: "{{ .Values.global.apiUrl }}"
 - name: "AppUrls__Admin"
-  value: "{{ .Values.global.adminUrlFull }}"
+  value: "{{ .Values.global.adminUrl }}"
 - name: "AppUrls__AdminApi"
-  value: "{{ .Values.global.adminApiUrlFull }}"
+  value: "{{ .Values.global.adminApiUrl }}"
 - name: "Redis__Configuration"
   value: "{{ .Values.global.redisConfiguration }}"
 - name: "AuthServer__Authority"
diff --git a/etc/k8s/helm-chart/eventhub/values.yaml b/etc/k8s/helm-chart/eventhub/values.yaml
index 652460c..5cf6e4e 100644
--- a/etc/k8s/helm-chart/eventhub/values.yaml
+++ b/etc/k8s/helm-chart/eventhub/values.yaml
@@ -1,14 +1,14 @@
 global:
-  accountUrl: eh-st-account
-  accountUrlFull: https://eh-st-account
-  apiUrl: eh-st-api
-  apiUrlFull: https://eh-st-api
-  wwwUrl: eh-st-www
-  wwwUrlFull: "https://eh-st-www"
-  adminUrl: eh-st-admin
-  adminUrlFull: https://eh-st-admin
-  adminApiApiUrl: eh-st-admin-api
-  adminApiUrlFull: https://eh-st-admin-api
+  accountDomain: eh-st-account
+  accountUrl: https://eh-st-account
+  apiDomain: eh-st-api
+  apiUrl: https://eh-st-api
+  wwwDomain: eh-st-www
+  wwwUrl: "https://eh-st-www"
+  adminDomain: eh-st-admin
+  adminUrl: https://eh-st-admin
+  adminApiDomain: eh-st-admin-api
+  adminApiUrl: https://eh-st-admin-api
   nginxProxyBufferSize: "32k"
   nginxProxyBuffersNumber: "8"
   defaultConnString: "Host=eh-st-postgresql;Port=5435;Database=EventHub;Username=root;Password=root"