Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Jaeger] Jaeger allInOne allow different storage types #603

Merged
merged 1 commit into from
Sep 20, 2024
+2 −12
Merged

[Jaeger] Jaeger allInOne allow different storage types #603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/jaeger/Chart.yaml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading