Merge branch 'tempo-jaeger-precedence' into 'master'

Fix logic/precedence of Tempo/Jaeger

See merge request platform-one/big-bang/bigbang!1574

chart/templates/istio/controlplane/values.yaml

@@ -13,8 +13,7 @@ enterprise: {{ .Values.istio.enterprise }}
 tracing:
 {{- if .Values.jaeger.enabled }}
   enabled: {{ .Values.jaeger.enabled }}
-{{- end }}
-{{- if .Values.tempo.enabled }}
+{{- else if .Values.tempo.enabled }}
   enabled:  {{ .Values.tempo.enabled }}
   address: 'tempo-tempo.tempo.svc'
   sampling: 100