Merge pull request #19 from mjwloch/kubeitDefaultHosts-tenantPrefixEn…

…abled Moved tenantPrefixEnabled to kubeitDefaultHosts section. Fixed a related bug for non-kubeit deployments.
dnvgl · Nov 28, 2022 · 99a3bde · 99a3bde
2 parents 54473a0 + 56b6359
commit 99a3bde
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/charts/platform-service/Chart.yaml b/charts/platform-service/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 appVersion: "1.1"
 description: Platform service chart
 name: platform-service
-version: 1.1.0
+version: 1.1.1
diff --git a/charts/platform-service/templates/_helpers.tpl b/charts/platform-service/templates/_helpers.tpl
@@ -43,13 +43,13 @@ app.kubernetes.io/name: {{ include "platform-service.name" . }}
 helm.sh/chart: {{ include "platform-service.chart" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 version: {{ .Values.version }}
-{{ if $.Values.kubeit }}
+{{ if $.Values.kubeit.tenantName }}
 tenant: {{ $.Values.kubeit.tenantName }}
+{{- end -}}
 {{- if or ( .Values.podIdentityName ) ( .Values.kubeit.tenantPodIdentityName ) }}
 aadpodidbinding: {{ .Values.podIdentityName | default .Values.kubeit.tenantPodIdentityName }}
 {{- end }}
 {{ if $.Values.volumes -}}
 state: stateful
 {{- end -}}
-{{- end -}}
 {{- end -}}
diff --git a/charts/platform-service/templates/virtualservice.yaml b/charts/platform-service/templates/virtualservice.yaml
@@ -1,5 +1,5 @@
 {{ $tenantPrefix := "" }}
-{{- if $.Values.kubeit.tenantPrefixEnabled }}
+{{- if $.Values.kubeitDefaultHosts.tenantPrefixEnabled }}
 {{ $tenantPrefix = printf "-%s" .Values.kubeit.tenantName }}
 {{- end }}
 

diff --git a/charts/platform-service/values.yaml b/charts/platform-service/values.yaml
@@ -83,6 +83,7 @@ defaultRouting:
   enabled: true
 
   kubeitDefaultHosts:
+    tenantPrefixEnabled: true
     enabled: false
     # hostsPrefix:            # Optional - default app name
 
@@ -270,7 +271,6 @@ containerSecurityContext: {}
 
 debugEnvoyFilters: true
 
-kubeit:
-  tenantPrefixEnabled: true
+#kubeit: #placeholder used for kubeit parameters passed from tenant bootstrap app of apps
 
 initContainersDefinitions: []