diff --git a/kiali-server/templates/_helpers.tpl b/kiali-server/templates/_helpers.tpl index 409c158..28302a5 100644 --- a/kiali-server/templates/_helpers.tpl +++ b/kiali-server/templates/_helpers.tpl @@ -145,3 +145,14 @@ Determine the auth strategy to use - default is "token" on Kubernetes and "opens {{- end }} {{- end }} {{- end }} + +{{/* +Determine the root namespace - default is where Kiali is installed. +*/}} +{{- define "kiali-server.external_services.istio.root_namespace" -}} +{{- if .Values.external_services.istio.root_namespace }} + {{- .Values.external_services.istio.root_namespace }} +{{- else }} + {{- .Release.Namespace }} +{{- end }} +{{- end }} \ No newline at end of file diff --git a/kiali-server/templates/configmap.yaml b/kiali-server/templates/configmap.yaml index f4bfa09..4d291af 100644 --- a/kiali-server/templates/configmap.yaml +++ b/kiali-server/templates/configmap.yaml @@ -20,6 +20,7 @@ data: {{- $_ := set $cm.identity "cert_file" (include "kiali-server.identity.cert_file" .) }} {{- $_ := set $cm.identity "private_key_file" (include "kiali-server.identity.private_key_file" .) }} {{- $_ := set $cm.login_token "signing_key" (include "kiali-server.login_token.signing_key" .) }} + {{- $_ := set $cm.external_services.istio "root_namespace" (include "kiali-server.external_services.istio.root_namespace" .) }} {{- $_ := set $cm.server "web_root" (include "kiali-server.server.web_root" .) }} {{- toYaml $cm | nindent 4 }} ... diff --git a/kiali-server/values.yaml b/kiali-server/values.yaml index db002fa..2a24646 100644 --- a/kiali-server/values.yaml +++ b/kiali-server/values.yaml @@ -69,6 +69,8 @@ deployment: external_services: custom_dashboards: enabled: true + istio: + root_namespace: "" identity: {} #cert_file: