UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit 87cfa3fd authored by Ryan Garcia's avatar Ryan Garcia :dizzy:
Browse files

Merge branch 'tempo_tracing_updates' into 'master'

Tempo tracing updates

Closes #1118

See merge request platform-one/big-bang/bigbang!1519
parents f00d5912 1afd4a71
No related branches found
No related tags found
1 merge request!1519Tempo tracing updates
Pipeline #750877 failed
......@@ -70,9 +70,15 @@ cr:
password: "secret:grafana-auth:password"
{{- end }}
tracing:
enabled: {{ .Values.jaeger.enabled }}
enabled: {{ or .Values.tempo.enabled .Values.jaeger.enabled }}
{{- if and .Values.tempo.enabled (not .Values.jaeger.enabled)}}
in_cluster_url: "http://tempo-tempo.tempo.svc.cluster.local:16686"
{{- $tracingUrl := first (dig "istio" "tempoQuery" "hosts" list .Values.tempo.values) }}
url: https://{{ tpl ($tracingUrl | default (printf "%s.%s" "tracing" $domainName )) . }}
{{- else}}
{{- $tracingUrl := first (dig "istio" "jaeger" "hosts" list .Values.jaeger.values) }}
url: https://{{ tpl ($tracingUrl | default (printf "%s.%s" "tracing" $domainName )) . }}
{{- end }}
istio:
component_status:
components:
......
......@@ -296,7 +296,7 @@ kiali:
git:
repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/kiali.git
path: "./chart"
tag: "1.47.0-bb.3"
tag: "1.47.0-bb.4"
# -- Flux reconciliation overrides specifically for the Kiali Package
flux: {}
......@@ -527,7 +527,7 @@ tempo:
git:
repo: https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/tempo.git
path: "./chart"
tag: "0.14.2-bb.0"
tag: "0.14.2-bb.1"
# -- Redirect the package ingress to a specific Istio Gateway (listed in `istio.gateways`). The default is "public".
ingress:
......
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