SKIP UPGRADE BB Changes for new tempo production config updates

chart/templates/NOTES.txt

@@ -132,6 +132,12 @@ PLATFORM ONE LOGGING WARNING:
   After the beta period, only one logging stack will be supported at one time, with the PLG stack becoming the default supported stack.
 {{- end }}
 
+{{- 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.
+{{- end }}
+
 {{- if $.Values.addons.mattermost.enabled }}
 Mattermost is enabled.
 {{- with .Values.addons.mattermost.database }}

chart/templates/jaeger/values.yaml

@@ -17,6 +17,7 @@ domain: {{ $domainName }}
 istio:
   enabled: {{ .Values.istio.enabled }}
   jaeger:
+    enabled: {{ .Values.istio.enabled }}
     gateways:
     - istio-system/{{ default "public" .Values.jaeger.ingress.gateway }}
 

chart/templates/tempo/values.yaml

@@ -13,6 +13,11 @@ tempo:
   imagePullSecrets:
   - name: private-registry
 
+    # hostname is deprecated and replaced with domain. But if hostname exists then use it.
+{{- $domainName := default .Values.domain .Values.hostname }}
+hostname: {{ $domainName }}
+domain: {{ $domainName }}
+
 tempo:
   pullPolicy: {{ .Values.imagePullPolicy }}
 
@@ -21,9 +26,27 @@ tempoQuery:
 
 networkPolicies:
   enabled: {{ .Values.networkPolicies.enabled }}
+  controlPlaneCidr: {{ .Values.networkPolicies.controlPlaneCidr }}
+  ingressLabels:
+    {{- $gateway := default "public" .Values.tempo.ingress.gateway }}
+    {{- $default := dict "app" (dig "gateways" $gateway "ingressGateway" nil .Values.istio) "istio" nil }}
+    {{- toYaml (dig "values" "gateways" $gateway "selector" $default .Values.istio) | nindent 4 }}
 
 istio:
   enabled: {{ .Values.istio.enabled }}
+  tempoQuery:
+    # During BETA Period set TempoQuery UI to "tempo." instead of soon to be default "tracing."
+    {{- if .Values.jaeger.enabled }}
+    hosts:
+      - "tempo.{{ .Values.domain }}"
+    {{- end }}
+    gateways:
+    - istio-system/{{ default "public" .Values.tempo.ingress.gateway }}
+
+{{- if .Values.istio.enabled }}
+podAnnotations:
+  {{ include "istioAnnotation" . }}
+{{- end }}
 
 monitoring:
   enabled: {{ .Values.monitoring.enabled }}

chart/values.yaml

@@ -527,7 +527,11 @@ tempo:
   git:
     repo: https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/tempo.git
     path: "./chart"
-    tag: "0.14.1-bb.0"
+    tag: "0.14.1-bb.1"
+  
+  # -- Redirect the package ingress to a specific Istio Gateway (listed in `istio.gateways`).  The default is "public".
+  ingress:
+    gateway: ""
 
   # -- Flux reconciliation overrides specifically for the Tempo Package
   flux: {}

tests/test-values.yaml

@@ -81,6 +81,9 @@ jaeger:
     enabled: false
     client_id: dev_00eb8904-5b88-4c68-ad67-cec0d2e07aa6_jaeger
   values:
+    istio:
+      jaeger:
+        enabled: true
     bbtests:
       enabled: true
       cypress:
@@ -457,22 +460,11 @@ loki:
 
 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:
+  values:
+    istio:
+      tempoQuery:
+        hosts:
+          - "tempo.{{ .Values.domain }}"
     resources:
       limits:
         cpu: 200m
@@ -481,14 +473,30 @@ tempo:
         cpu: 200m
         memory: 128Mi
 
-  opentelemetryCollector:
-    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