Skip to content

Commit 29a0e21

Browse files
authored
Jaeger allInOne allow different storage types (#603)
Signed-off-by: Reddysekhar Gaduputi <gsekhar73@gmail.com>
1 parent 2ee81aa commit 29a0e21

3 files changed

Lines changed: 2 additions & 12 deletions

File tree

charts/jaeger/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ appVersion: 1.53.0
33
description: A Jaeger Helm chart for Kubernetes
44
name: jaeger
55
type: application
6-
version: 3.3.0
6+
version: 3.3.1
77
# CronJobs require v1.21
88
kubeVersion: ">= 1.21-0"
99
keywords:

charts/jaeger/templates/_helpers.tpl

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -408,16 +408,6 @@ memory related environment variables
408408
{{- end }}
409409
{{- end -}}
410410

411-
{{/*
412-
allInOne currently only supports memory/badger storage type.
413-
*/}}
414-
{{- define "allInOne.storage.type" -}}
415-
{{ $type := .Values.storage.type }}
416-
{{- if or (eq $type "memory") (eq $type "badger") -}}
417-
{{ .Values.storage.type }}
418-
{{- end -}}
419-
{{- end -}}
420-
421411

422412
{{/*
423413
Cassandra, Elasticsearch, or grpc-plugin, badger, memory related environment variables depending on which is used

charts/jaeger/templates/allinone-deploy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ spec:
3737
{{- toYaml .Values.allInOne.extraEnv | nindent 12 }}
3838
{{- end }}
3939
- name: SPAN_STORAGE_TYPE
40-
value: {{ include "allInOne.storage.type" . | required "Invalid storage type provided. Use either badger or memory for allInOne" }}
40+
value: {{ .Values.storage.type }}
4141
{{- include "storage.env" . | nindent 12 }}
4242
- name: COLLECTOR_ZIPKIN_HOST_PORT
4343
value: :9411

0 commit comments

Comments
 (0)