Skip to content

Commit

Permalink
Merge pull request #155 from SOF3/issues/154
Browse files Browse the repository at this point in the history
fix(chart): incorrect reference to storage-options-stateless-raw template
  • Loading branch information
SOF3 authored Aug 7, 2023
2 parents 64e6ee6 + c359b5f commit dee0c6f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions charts/kelemetry/templates/_helpers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -306,14 +306,14 @@ jaeger-trace-cache-etcd-prefix: {{ .Values.frontend.traceCache.etcd.prefix | toJ
{{- if list "badger" "memory" | has .Values.storageBackend.type }}
{{- include "kelemetry.storage-options-stateful-grpc" . }}
{{- else }}
{{- include "kelemetry.storage-options-raw-stateless" . }}
{{- include "kelemetry.storage-options-stateless-raw" . }}
{{- end }}
{{- end }}
{{- define "kelemetry.storage-options-stateful-grpc" }}
span-storage.type: grpc-plugin
grpc-storage.server: {{.Release.Name}}-storage.{{.Release.Namespace}}.svc:17271
{{- end }}
{{- define "kelemetry.storage-options-raw-stateless" }}
{{- define "kelemetry.storage-options-stateless-raw" }}
span-storage.type: {{toJson .Values.storageBackend.type}}
{{- range $key, $value := .Values.storageBackend.options }}
{{ toJson $key }}: {{ toJson $value }}
Expand Down
2 changes: 1 addition & 1 deletion charts/kelemetry/templates/storage.deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
imagePullPolicy: {{ toJson .Values.jaegerImages.pullPolicy }}
args: [
# Don't include storage-options-raw directly here; otherwise the traffic would be infinite recursion.
{{- include "kelemetry.storage-options-stateless" . | include "kelemetry.yaml-to-args" }}
{{- include "kelemetry.storage-options-stateless-raw" . | include "kelemetry.yaml-to-args" }}
]
livenessProbe:
httpGet:
Expand Down

0 comments on commit dee0c6f

Please sign in to comment.