UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit 4ecc282b authored by Michael Martin's avatar Michael Martin
Browse files

Merge branch '2423-loki-domain' into 'master'

Resolve "chart/templates/loki/values.yaml does not override domain"

Closes #2423

See merge request !5726
parents 6394bc2e 4d8a7c33
No related branches found
No related tags found
1 merge request!5726Resolve "chart/templates/loki/values.yaml does not override domain"
Pipeline #3936222 passed
......@@ -3,7 +3,10 @@
{{- end }}
{{- define "bigbang.defaults.loki" -}}
hostname: {{ .Values.hostname }}
# hostname is deprecated and replaced with domain. But if hostname exists then use it.
{{- $domainName := default .Values.domain .Values.hostname }}
hostname: {{ $domainName }}
domain: {{ $domainName }}
clusterName: ""
......@@ -11,7 +14,7 @@ openshift: {{ .Values.openshift }}
istio:
enabled: {{ .Values.istio.enabled }}
{{- if or
{{- if or
(dig "hardened" "enabled" false .Values.istio.values)
(dig "istio" "hardened" "enabled" false .Values.monitoring.values)
(dig "istio" "hardened" "enabled" false .Values.addons.authservice.values)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment