diff --git a/charts/jaeger/Chart.yaml b/charts/jaeger/Chart.yaml index 33530522..7b103ab6 100644 --- a/charts/jaeger/Chart.yaml +++ b/charts/jaeger/Chart.yaml @@ -3,7 +3,7 @@ appVersion: 1.53.0 description: A Jaeger Helm chart for Kubernetes name: jaeger type: application -version: 3.3.0 +version: 3.3.1 # CronJobs require v1.21 kubeVersion: ">= 1.21-0" keywords: diff --git a/charts/jaeger/templates/_helpers.tpl b/charts/jaeger/templates/_helpers.tpl index 3bb14071..f4db73be 100644 --- a/charts/jaeger/templates/_helpers.tpl +++ b/charts/jaeger/templates/_helpers.tpl @@ -408,16 +408,6 @@ memory related environment variables {{- end }} {{- end -}} -{{/* -allInOne currently only supports memory/badger storage type. -*/}} -{{- define "allInOne.storage.type" -}} -{{ $type := .Values.storage.type }} -{{- if or (eq $type "memory") (eq $type "badger") -}} -{{ .Values.storage.type }} -{{- end -}} -{{- end -}} - {{/* Cassandra, Elasticsearch, or grpc-plugin, badger, memory related environment variables depending on which is used diff --git a/charts/jaeger/templates/allinone-deploy.yaml b/charts/jaeger/templates/allinone-deploy.yaml index 91e27943..aae25811 100644 --- a/charts/jaeger/templates/allinone-deploy.yaml +++ b/charts/jaeger/templates/allinone-deploy.yaml @@ -37,7 +37,7 @@ spec: {{- toYaml .Values.allInOne.extraEnv | nindent 12 }} {{- end }} - name: SPAN_STORAGE_TYPE - value: {{ include "allInOne.storage.type" . | required "Invalid storage type provided. Use either badger or memory for allInOne" }} + value: {{ .Values.storage.type }} {{- include "storage.env" . | nindent 12 }} - name: COLLECTOR_ZIPKIN_HOST_PORT value: :9411