UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit 9e41ad3d authored by Micah Nagel's avatar Micah Nagel
Browse files

Merge branch '1060-add-annotations' into 'master'

Tempo add istio annotations

Closes #1060

See merge request platform-one/big-bang/bigbang!1317
parents c481cf90 122ca1de
No related branches found
No related tags found
3 merge requests!1658Draft: Merge branch 'tempo_tracing_updates' into 'master',!1386Master,!1317Tempo add istio annotations
Pipeline #678572 passed with warnings
......@@ -4,6 +4,11 @@
{{- define "bigbang.defaults.tempo" -}}
{{- if .Values.istio.enabled }}
podAnnotations:
{{ include "istioAnnotation" . }}
{{- end }}
tempo:
imagePullSecrets:
- name: private-registry
......
......@@ -469,7 +469,7 @@ tempo:
git:
repo: https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/tempo.git
path: "./chart"
tag: "0.12.2-bb.2"
tag: "0.12.2-bb.3"
# -- Flux reconciliation overrides specifically for the Tempo Package
flux: {}
......
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