Jaeger Istio Annotations

chart/templates/jaeger/values.yaml

@@ -20,6 +20,11 @@ istio:
     gateways:
     - istio-system/{{ default "public" .Values.jaeger.ingress.gateway }}
 
+{{- if .Values.istio.enabled }}
+annotations:
+  {{ include "istioAnnotation" . }}
+{{- end }}
+
 monitoring:
   enabled: {{ .Values.monitoring.enabled }}
 elasticsearch:
@@ -28,17 +33,40 @@ elasticsearch:
 sso:
   enabled: {{ .Values.jaeger.sso.enabled }}
 
-{{- if .Values.jaeger.sso.enabled }}
+{{- if or .Values.jaeger.sso.enabled .Values.istio.enabled }}
 jaeger:
   spec:
     {{- $jaegerAuthserviceKey := (dig "selector" "key" "protect" .Values.addons.authservice.values) }}
     {{- $jaegerAuthserviceValue := (dig "selector" "value" "keycloak" .Values.addons.authservice.values) }}
     allInOne:
+      {{- if .Values.jaeger.sso.enabled }}
       labels:
         {{ $jaegerAuthserviceKey }}: {{ $jaegerAuthserviceValue }}
+      {{- end }}
+      {{- if .Values.istio.enabled }}
+      annotations:
+        {{ include "istioAnnotation" . }}
+      {{- end }}
     query:
+      {{- if .Values.jaeger.sso.enabled }}
       labels:
         {{ $jaegerAuthserviceKey }}: {{ $jaegerAuthserviceValue }}
+      {{- end }}
+      {{- if .Values.istio.enabled }}
+      annotations:
+        {{ include "istioAnnotation" . }}
+      {{- end }}
+    {{- if .Values.istio.enabled }}
+    agent:
+      annotations:
+        {{ include "istioAnnotation" . }}
+    ingester:
+      annotations:
+        {{ include "istioAnnotation" . }}
+    collector:
+      annotations:
+        {{ include "istioAnnotation" . }}
+    {{- end }}
 {{- end }}
 openshift:
   enabled: {{ .Values.openshift }}

chart/values.yaml

@@ -218,7 +218,7 @@ jaeger:
   git:
     repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/jaeger.git
     path: "./chart"
-    tag: "2.27.0-bb.0"
+    tag: "2.27.0-bb.1"
 
   # -- Flux reconciliation overrides specifically for the Jaeger Package
   flux: