diff --git a/chart/templates/jaeger/values.yaml b/chart/templates/jaeger/values.yaml index 216511388f59743fccb3c2cc35fc7b531e99c4cf..afc779ab0d54cb8a8c2c9724dfba4e46b4b87945 100644 --- a/chart/templates/jaeger/values.yaml +++ b/chart/templates/jaeger/values.yaml @@ -50,9 +50,21 @@ elasticsearch: sso: enabled: {{ .Values.jaeger.sso.enabled }} -{{- if or .Values.jaeger.sso.enabled .Values.istio.enabled }} +{{- if .Values.kiali.enabled }} +extraLabels: + app: jaeger-jaeger-jaeger-operator + {{- include "kialiVersionLabel" . | nindent 2 }} +{{- end }} + +{{- if or .Values.jaeger.sso.enabled .Values.istio.enabled .Values.kiali.enabled }} jaeger: spec: + {{- if .Values.kiali.enabled }} + labels: + {{- include "kialiAppLabel" . | nindent 6 }} + {{- include "kialiVersionLabel" . | nindent 6 }} + {{- end }} + {{- if or .Values.jaeger.sso.enabled .Values.istio.enabled }} {{- $jaegerAuthserviceKey := (dig "selector" "key" "protect" .Values.addons.authservice.values) }} {{- $jaegerAuthserviceValue := (dig "selector" "value" "keycloak" .Values.addons.authservice.values) }} allInOne: @@ -73,6 +85,7 @@ jaeger: annotations: {{ include "istioAnnotation" . }} {{- end }} + {{- end }} {{- if .Values.istio.enabled }} agent: annotations: diff --git a/chart/values.yaml b/chart/values.yaml index 9f3736838e361ddcd41cb5970deff7f40d2e7aac..8a93918a69034d3ef7688d3de3005a70252e8573 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -341,11 +341,11 @@ jaeger: git: repo: https://repo1.dso.mil/big-bang/product/packages/jaeger.git path: "./chart" - tag: "2.54.0-bb.2" + tag: "2.54.0-bb.3" helmRepo: repoName: "registry1" chartName: "jaeger" - tag: "2.54.0-bb.2" + tag: "2.54.0-bb.3" # -- Flux reconciliation overrides specifically for the Jaeger Package flux: