Merge branch 'resolve-tempo-duplicate-keys' into 'master'

Resolve tempo duplicate keys

Closes platform-one/big-bang/apps/sandbox/tempo#2

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

chart/values.yaml

@@ -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.1"
+    tag: "0.12.2-bb.2"
 
   # -- Flux reconciliation overrides specifically for the Tempo Package
   flux: {}

tests/test-values.yaml

@@ -244,6 +244,41 @@ fluentbit:
     bbtests:
       enabled: true
 
+tempo:
+  enabled: false
+  resources:
+    limits:
+      cpu: 200m
+      memory: 128Mi
+    requests:
+      cpu: 200m
+      memory: 128Mi
+
+  persistence:
+    enabled: true
+    # storageClassName: local-path
+    accessModes:
+      - ReadWriteOnce
+    size: 5Gi
+
+  tempoQuery:
+    resources:
+      limits:
+        cpu: 200m
+        memory: 128Mi
+      requests:
+        cpu: 200m
+        memory: 128Mi
+
+  opentelemetryCollector:
+    resources:
+      limits:
+        cpu: 200m
+        memory: 128Mi
+      requests:
+        cpu: 200m
+        memory: 128Mi
+
 monitoring:
   enabled: true
   sso:
@@ -689,7 +724,7 @@ addons:
         scripts:
           envs:
             ANCHORE_CLI_URL: "https://anchore-api.bigbang.dev/v1"
- 
+
   sonarqube:
     enabled: false
     sso:
@@ -968,7 +1003,7 @@ addons:
                       app.kubernetes.io/instance: "{{ .Release.Name }}"
                       component: webhook
                   topologyKey: kubernetes.io/hostname
- 
+
       bbtests:
         enabled: true
         cypress: