Skip to content

Commit

Permalink
Jaeger allInOne allow different storage types
Browse files Browse the repository at this point in the history
Signed-off-by: Reddysekhar Gaduputi <Reddysekhar Gaduputi>
  • Loading branch information
rgaduput authored and Reddysekhar Gaduputi committed Sep 19, 2024
1 parent 2ee81aa commit 60339a9
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 12 deletions.
2 changes: 1 addition & 1 deletion charts/jaeger/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 0 additions & 10 deletions charts/jaeger/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion charts/jaeger/templates/allinone-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 60339a9

Please sign in to comment.