UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit 4ff64630 authored by Andrew Shoell's avatar Andrew Shoell
Browse files

Merge branch 'update-tempo-tag-1.10.1-bb.1' into 'master'

tempo update to 1.10.1-bb.1

Closes big-bang/product/packages/tempo#78

See merge request !5007
parents d7e6617b 56ae825f
No related branches found
No related tags found
2 merge requests!5067Rebase alloy with master branch,!5007tempo update to 1.10.1-bb.1
Pipeline #3576139 failed
......@@ -93,11 +93,17 @@ serviceMonitor:
sso:
enabled: {{ .Values.tempo.sso.enabled }}
{{- if .Values.tempo.sso.enabled }}
{{- if or .Values.kiali.enabled .Values.tempo.sso.enabled }}
{{- $tempoAuthserviceKey := (dig "selector" "key" "protect" .Values.addons.authservice.values) }}
{{- $tempoAuthserviceValue := (dig "selector" "value" "keycloak" .Values.addons.authservice.values) }}
podLabels:
{{- if .Values.kiali.enabled }}
{{- include "kialiAppLabel" . | nindent 2 }}
{{- include "kialiVersionLabel" . | nindent 2 }}
{{- end }}
{{- if .Values.tempo.sso.enabled }}
{{ $tempoAuthserviceKey }}: {{ $tempoAuthserviceValue }}
{{- end }}
{{- end }}
{{- end -}}
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