Merge pull request #20 from mjwloch/kubeitfix

Fixed kubeit labels kubeitDefaultHosts so that no exc is thrown for n…
dnvgl · Nov 29, 2022 · c3b5cb2 · c3b5cb2
2 parents 99a3bde + d917101
commit c3b5cb2
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 10 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.1
+version: 1.1.2
diff --git a/charts/platform-service/templates/_helpers.tpl b/charts/platform-service/templates/_helpers.tpl
@@ -43,11 +43,25 @@ 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.tenantName }}
+{{- 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 -}}
+
+{{ $podIdentityName := "" }}
+{{- if $.Values.kubeit }}
+{{- if $.Values.kubeit.tenantPodIdentityName }}
+{{ $podIdentityName = .Values.kubeit.tenantPodIdentityName }}
+{{- end }}
+{{- end }}
+
+{{- if $.Values.podIdentityName }}
+{{ $podIdentityName = .Values.podIdentityName }}
+{{- end }}
+
+{{- if $podIdentityName }}
+aadpodidbinding: {{ $podIdentityName }}
 {{- end }}
 {{ if $.Values.volumes -}}
 state: stateful

diff --git a/charts/platform-service/templates/virtualservice.yaml b/charts/platform-service/templates/virtualservice.yaml
@@ -1,8 +1,3 @@
-{{ $tenantPrefix := "" }}
-{{- if $.Values.kubeitDefaultHosts.tenantPrefixEnabled }}
-{{ $tenantPrefix = printf "-%s" .Values.kubeit.tenantName }}
-{{- end }}
-
 {{- define "retries" -}}
 {{- if .Values.defaultRouting.retries.enabled }}
     retries:
@@ -45,6 +40,10 @@ metadata:
 spec:
   hosts:
   {{- if .Values.defaultRouting.kubeitDefaultHosts.enabled }}
+  {{ $tenantPrefix := "" }}
+  {{- if and $.Values.defaultRouting.kubeitDefaultHosts.enabled $.Values.defaultRouting.kubeitDefaultHosts.tenantPrefixEnabled }}
+  {{ $tenantPrefix = printf "-%s" .Values.kubeit.tenantName }}
+  {{- end }}
     - "{{ .Values.defaultRouting.kubeitDefaultHosts.hostsPrefix | default .Values.app }}{{ $tenantPrefix }}.{{ .Values.kubeit.clusterSubdomain }}.{{ .Values.defaultRouting.kubeitDefaultHosts.dnsDomain }}"                                                                      # Cluster specific subdomain, i.e.: dev001
     - "{{ .Values.defaultRouting.kubeitDefaultHosts.hostsPrefix | default .Values.app }}{{ $tenantPrefix }}.{{ .Values.kubeit.shortRegion }}.{{ .Values.kubeit.environmentName }}.{{ .Values.defaultRouting.kubeitDefaultHosts.dnsDomain }}"                                      # F5/Active Cluster
     - "{{ .Values.defaultRouting.kubeitDefaultHosts.hostsPrefix | default .Values.app }}{{ $tenantPrefix }}.{{ .Values.kubeit.clusterColour }}.{{ .Values.kubeit.shortRegion }}.{{ .Values.kubeit.environmentName }}.{{ .Values.defaultRouting.kubeitDefaultHosts.dnsDomain }}"   # Colour cluster - blue/green deployment

diff --git a/charts/platform-service/values.yaml b/charts/platform-service/values.yaml
@@ -83,8 +83,8 @@ defaultRouting:
   enabled: true
 
   kubeitDefaultHosts:
-    tenantPrefixEnabled: true
     enabled: false
+    tenantPrefixEnabled: true
     # hostsPrefix:            # Optional - default app name
 
   # hosts to take into account for routing rules (ignored if allHosts = true)