Allow args to be passed to Jaeger (#6587) (#6588)

* Allow args to be passed to Jaeger (#6587)
* Update linkerd-jaeger helm docs

Signed-off-by: mgmtadmin <brandon.sorgdrager@gmail.com>
This commit is contained in:
Brandon Sorgdrager 2021-08-12 12:14:59 -05:00 committed by GitHub
parent 6a0d1638ff
commit 4f12e905af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 1 deletions

View File

@ -88,6 +88,7 @@ Kubernetes: `>=1.16.0-0`
| collector.tolerations | string | `nil` | Tolerations section, See the [K8S documentation](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) for more information |
| enablePSP | bool | `false` | Create Roles and RoleBindings to associate this extension's ServiceAccounts to the control plane PSP resource. This requires that `enabledPSP` is set to true on the control plane install. Note PSP has been deprecated since k8s v1.21 |
| installNamespace | bool | `true` | Set to false when installing in a custom namespace. |
| jaeger.args | list | `["--query.base-path=/jaeger"]` | CLI arguments for Jaeger, See [Jaeger AIO Memory CLI reference](https://www.jaegertracing.io/docs/1.24/cli/#jaeger-all-in-one-memory) |
| jaeger.enabled | bool | `true` | Set to false to exclude all-in-one Jaeger installation |
| jaeger.image.name | string | `"jaegertracing/all-in-one"` | |
| jaeger.image.pullPolicy | string | `"Always"` | |

View File

@ -175,7 +175,9 @@ spec:
{{- include "linkerd.node-selector" (dict "Values" .Values.jaeger) | nindent 6 }}
containers:
- args:
- --query.base-path=/jaeger
{{- range .Values.jaeger.args }}
- {{ . -}}
{{ end }}
image: {{.Values.jaeger.image.name}}:{{.Values.jaeger.image.version}}
imagePullPolicy: {{.Values.jaeger.image.pullPolicy}}
name: jaeger

View File

@ -81,6 +81,10 @@ jaeger:
version: 1.19.2
pullPolicy: Always
# -- CLI arguments for Jaeger, See [Jaeger AIO Memory CLI reference](https://www.jaegertracing.io/docs/1.24/cli/#jaeger-all-in-one-memory)
args:
- --query.base-path=/jaeger
# -- NodeSelector section, See the
# [K8S documentation](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector) for more information
nodeSelector: *default_node_selector