UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit 786d8aeb authored by Andrew Shoell's avatar Andrew Shoell
Browse files

Merge branch 'update-jaeger-tag-2.54.0-bb.3' into 'master'

jaeger update to 2.54.0-bb.3

Closes big-bang/product/packages/jaeger#133

See merge request !4915
parents 09623055 b5ea0507
No related branches found
No related tags found
1 merge request!4915jaeger update to 2.54.0-bb.3
Pipeline #3542083 passed
......@@ -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:
......
......@@ -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:
......
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