Skip to content

Commit 11b990f

Browse files
authored
add .Values.allInOne.extraSecretMounts and corresponding deployment templating; bump chart version; update readme (#487)
Signed-off-by: Conrad Hanson <27842017+conradhanson@users.noreply.github.com>
1 parent fac871f commit 11b990f

4 files changed

Lines changed: 27 additions & 5 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.45.0
33
description: A Jaeger Helm chart for Kubernetes
44
name: jaeger
55
type: application
6-
version: 0.71.8
6+
version: 0.71.9
77
# CronJobs require v1.21
88
kubeVersion: '>= 1.21-0'
99
keywords:

charts/jaeger/README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ query:
311311
enabled: false
312312
```
313313

314-
It's possible to specify resources and extra environment variables for the all in one deployment:
314+
It's possible to specify resources, extra environment variables, and extra secrets for the all in one deployment:
315315

316316
```yaml
317317
allInOne:
@@ -325,6 +325,12 @@ allInOne:
325325
requests:
326326
cpu: 256m
327327
memory: 128Mi
328+
extraSecretMounts:
329+
- name: jaeger-tls
330+
mountPath: /tls
331+
subPath: ""
332+
secretName: jaeger-tls
333+
readOnly: true
328334
```
329335

330336
```bash

charts/jaeger/templates/allinone-deploy.yaml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,19 +98,29 @@ spec:
9898
resources:
9999
{{- toYaml . | nindent 12 }}
100100
{{- end }}
101-
102-
{{- if .Values.allInOne.samplingConfig}}
103101
volumeMounts:
102+
{{- if .Values.allInOne.samplingConfig}}
104103
- name: strategies
105104
mountPath: /etc/conf/
106105
{{- end }}
106+
{{- range .Values.allInOne.extraSecretMounts }}
107+
- name: {{ .name }}
108+
mountPath: {{ .mountPath }}
109+
subPath: {{ .subPath }}
110+
readOnly: {{ .readOnly }}
111+
{{- end }}
107112
serviceAccountName: {{ template "jaeger.fullname" . }}
108-
{{- if .Values.allInOne.samplingConfig}}
109113
volumes:
114+
{{- if .Values.allInOne.samplingConfig}}
110115
- name: strategies
111116
configMap:
112117
name: {{ include "jaeger.fullname" . }}-sampling-strategies
113118
{{- end }}
119+
{{- range .Values.allInOne.extraSecretMounts }}
120+
- name: {{ .name }}
121+
secret:
122+
secretName: {{ .secretName }}
123+
{{- end }}
114124
{{- with .Values.allInOne.nodeSelector }}
115125
nodeSelector:
116126
{{- toYaml . | nindent 8 }}

charts/jaeger/values.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ allInOne:
2121
image: jaegertracing/all-in-one
2222
pullPolicy: IfNotPresent
2323
extraEnv: []
24+
extraSecretMounts: []
25+
# - name: jaeger-tls
26+
# mountPath: /tls
27+
# subPath: ""
28+
# secretName: jaeger-tls
29+
# readOnly: true
2430
# command line arguments / CLI flags
2531
# See https://www.jaegertracing.io/docs/cli/
2632
args: []

0 commit comments

Comments
 (0)