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

tempo update to 1.16.0-bb.1

See merge request !5654

chart/templates/NOTES.txt

@@ -150,7 +150,7 @@ PLATFORM ONE LOKI WARNING:
 {{- if and $.Values.jaeger.enabled .Values.tempo.enabled }}
 PLATFORM ONE TRACING WARNING:
   You have enabled both Jaeger and Tempo Tracing Engines.  This is permitted during beta testing of Tempo.
-  After the beta period, only one Tracing engine will be supported at one time, with Tempo becoming the default supported engine over a direct Jaeger installation. Tempo will deploy with Tempo-Query, a Jaeger frontend with Tempo as the backend.
+  After the beta period, only one Tracing engine will be supported at one time, with Tempo becoming the default supported engine over a direct Jaeger installation. Grafana has a built-in Tempo data source that can be used to query Tempo and visualize traces. 
 {{- end }}
 
 {{- if $.Values.addons.mattermost.enabled }}
@@ -413,4 +413,4 @@ PLATFORM ONE THANOS WARNING:
 PLATFORM ONE LOKI WARNING:
   BigBang does not support the Loki Distributed deployment mode. For production deployments,
   please set your strategy to "scalable" or "monolithic"
-{{- end }}
\ No newline at end of file
+{{- end }}

chart/templates/authservice/values.yaml

@@ -187,31 +187,6 @@ chains:
     {{- end }}
   {{- end }}
 
-  {{- $tempoQueryEnabled := (dig "tempoQuery" "enabled" false .Values.tempo.values) }}
-  {{- if and $tempoQueryEnabled .Values.tempo.enabled .Values.tempo.sso.enabled }}
-  tempo:
-    match:
-      header: ":authority"
-    {{- $tempoHosts := (dig "istio" "tempoQuery" "hosts" dict .Values.tempo.values) }}
-    {{- if $tempoHosts }}
-      prefix: {{ tpl ($tempoHosts | first) $ }}
-    callback_uri: https://{{ tpl ($tempoHosts | first) $ }}/login
-    {{- else if .Values.jaeger.enabled }}
-      prefix: {{ printf "tempo.%s" $domainName }}
-    callback_uri: https://tempo.{{ $domainName }}/login
-    {{- else }}
-      prefix: {{ printf "tracing.%s" $domainName }}
-    callback_uri: https://tracing.{{ $domainName }}/login
-    {{- end }}
-    client_id: "{{ .Values.tempo.sso.client_id }}"
-    client_secret: "{{ .Values.tempo.sso.client_secret }}"
-    {{- if not $legacy }}
-    authorization_uri: {{ include "sso.oidc.auth" . }}
-    token_uri: {{ include "sso.oidc.token" . }}
-    logout_redirect_uri: {{ include "sso.oidc.endsession" . }}
-    {{- end }}
-  {{- end }}
-
   {{- if and .Values.monitoring.enabled .Values.monitoring.sso.enabled }}
   prometheus:
     match:

chart/templates/kiali/values.yaml

@@ -88,16 +88,9 @@ cr:
           password: "secret:grafana-auth:password"
         {{- end }}
       tracing:
-        {{- $tempoQueryEnabled := (dig "tempoQuery" "enabled" false .Values.tempo.values) }}
-        enabled: {{ or (and .Values.tempo.enabled $tempoQueryEnabled) .Values.jaeger.enabled }}
-        {{- if and $tempoQueryEnabled (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}}
+        enabled: {{ .Values.jaeger.enabled }}
         {{- $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:

chart/values.yaml

@@ -810,11 +810,11 @@ tempo:
   git:
     repo: https://repo1.dso.mil/big-bang/product/packages/tempo.git
     path: "./chart"
-    tag: "1.16.0-bb.0"
+    tag: "1.16.0-bb.1"
   helmRepo:
     repoName: "registry1"
     chartName: "tempo"
-    tag: "1.16.0-bb.0"
+    tag: "1.16.0-bb.1"
 
   # -- Redirect the package ingress to a specific Istio Gateway (listed in `istio.gateways`).  The default is "public".
   ingress: