mirror of https://github.com/linkerd/linkerd2.git
Helm chart - linkerd2-collector : enable jaeger receiver (#4783)
Fixes #4778 Signed-off-by: Olivier Boudet <o.boudet@gmail.com>
This commit is contained in:
parent
0b649e3ed7
commit
f599bf9b10
|
@ -20,6 +20,8 @@ data:
|
||||||
port: 55678
|
port: 55678
|
||||||
zipkin:
|
zipkin:
|
||||||
port: 9411
|
port: 9411
|
||||||
|
jaeger:
|
||||||
|
jaeger-thrift-http-port: 14268
|
||||||
queued-exporters:
|
queued-exporters:
|
||||||
jaeger-all-in-one:
|
jaeger-all-in-one:
|
||||||
num-workers: 4
|
num-workers: 4
|
||||||
|
@ -51,6 +53,10 @@ spec:
|
||||||
port: 9411
|
port: 9411
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
targetPort: 9411
|
targetPort: 9411
|
||||||
|
- name: jaeger
|
||||||
|
port: 14268
|
||||||
|
protocol: TCP
|
||||||
|
targetPort: 14268
|
||||||
selector:
|
selector:
|
||||||
{{.Values.global.controllerComponentLabel}}: linkerd-collector
|
{{.Values.global.controllerComponentLabel}}: linkerd-collector
|
||||||
---
|
---
|
||||||
|
@ -110,6 +116,7 @@ spec:
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 55678
|
- containerPort: 55678
|
||||||
- containerPort: 9411
|
- containerPort: 9411
|
||||||
|
- containerPort: 14268
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /
|
path: /
|
||||||
|
|
|
@ -12,4 +12,4 @@ dependencies:
|
||||||
repository: file://../add-ons/tracing
|
repository: file://../add-ons/tracing
|
||||||
version: 0.1.0
|
version: 0.1.0
|
||||||
digest: sha256:d2428770ae7d5134c5af6521c78a4c5f95da4c75f21bdea0f74fad6ab6e2e044
|
digest: sha256:d2428770ae7d5134c5af6521c78a4c5f95da4c75f21bdea0f74fad6ab6e2e044
|
||||||
generated: "2020-06-24T11:07:53.924602129Z"
|
generated: "2020-07-23T14:47:05.936935407+02:00"
|
||||||
|
|
|
@ -2550,6 +2550,8 @@ data:
|
||||||
port: 55678
|
port: 55678
|
||||||
zipkin:
|
zipkin:
|
||||||
port: 9411
|
port: 9411
|
||||||
|
jaeger:
|
||||||
|
jaeger-thrift-http-port: 14268
|
||||||
queued-exporters:
|
queued-exporters:
|
||||||
jaeger-all-in-one:
|
jaeger-all-in-one:
|
||||||
num-workers: 4
|
num-workers: 4
|
||||||
|
@ -2581,6 +2583,10 @@ spec:
|
||||||
port: 9411
|
port: 9411
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
targetPort: 9411
|
targetPort: 9411
|
||||||
|
- name: jaeger
|
||||||
|
port: 14268
|
||||||
|
protocol: TCP
|
||||||
|
targetPort: 14268
|
||||||
selector:
|
selector:
|
||||||
linkerd.io/control-plane-component: linkerd-collector
|
linkerd.io/control-plane-component: linkerd-collector
|
||||||
---
|
---
|
||||||
|
@ -2638,6 +2644,7 @@ spec:
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 55678
|
- containerPort: 55678
|
||||||
- containerPort: 9411
|
- containerPort: 9411
|
||||||
|
- containerPort: 14268
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /
|
path: /
|
||||||
|
|
|
@ -3456,6 +3456,8 @@ data:
|
||||||
port: 55678
|
port: 55678
|
||||||
zipkin:
|
zipkin:
|
||||||
port: 9411
|
port: 9411
|
||||||
|
jaeger:
|
||||||
|
jaeger-thrift-http-port: 14268
|
||||||
queued-exporters:
|
queued-exporters:
|
||||||
jaeger-all-in-one:
|
jaeger-all-in-one:
|
||||||
num-workers: 4
|
num-workers: 4
|
||||||
|
@ -3487,6 +3489,10 @@ spec:
|
||||||
port: 9411
|
port: 9411
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
targetPort: 9411
|
targetPort: 9411
|
||||||
|
- name: jaeger
|
||||||
|
port: 14268
|
||||||
|
protocol: TCP
|
||||||
|
targetPort: 14268
|
||||||
selector:
|
selector:
|
||||||
linkerd.io/control-plane-component: linkerd-collector
|
linkerd.io/control-plane-component: linkerd-collector
|
||||||
---
|
---
|
||||||
|
@ -3544,6 +3550,7 @@ spec:
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 55678
|
- containerPort: 55678
|
||||||
- containerPort: 9411
|
- containerPort: 9411
|
||||||
|
- containerPort: 14268
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /
|
path: /
|
||||||
|
|
|
@ -3418,6 +3418,8 @@ data:
|
||||||
port: 55678
|
port: 55678
|
||||||
zipkin:
|
zipkin:
|
||||||
port: 9411
|
port: 9411
|
||||||
|
jaeger:
|
||||||
|
jaeger-thrift-http-port: 14268
|
||||||
queued-exporters:
|
queued-exporters:
|
||||||
jaeger-all-in-one:
|
jaeger-all-in-one:
|
||||||
num-workers: 4
|
num-workers: 4
|
||||||
|
@ -3449,6 +3451,10 @@ spec:
|
||||||
port: 9411
|
port: 9411
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
targetPort: 9411
|
targetPort: 9411
|
||||||
|
- name: jaeger
|
||||||
|
port: 14268
|
||||||
|
protocol: TCP
|
||||||
|
targetPort: 14268
|
||||||
selector:
|
selector:
|
||||||
linkerd.io/control-plane-component: linkerd-collector
|
linkerd.io/control-plane-component: linkerd-collector
|
||||||
---
|
---
|
||||||
|
@ -3506,6 +3512,7 @@ spec:
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 55678
|
- containerPort: 55678
|
||||||
- containerPort: 9411
|
- containerPort: 9411
|
||||||
|
- containerPort: 14268
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /
|
path: /
|
||||||
|
|
|
@ -3420,6 +3420,8 @@ data:
|
||||||
port: 55678
|
port: 55678
|
||||||
zipkin:
|
zipkin:
|
||||||
port: 9411
|
port: 9411
|
||||||
|
jaeger:
|
||||||
|
jaeger-thrift-http-port: 14268
|
||||||
queued-exporters:
|
queued-exporters:
|
||||||
jaeger-all-in-one:
|
jaeger-all-in-one:
|
||||||
num-workers: 4
|
num-workers: 4
|
||||||
|
@ -3451,6 +3453,10 @@ spec:
|
||||||
port: 9411
|
port: 9411
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
targetPort: 9411
|
targetPort: 9411
|
||||||
|
- name: jaeger
|
||||||
|
port: 14268
|
||||||
|
protocol: TCP
|
||||||
|
targetPort: 14268
|
||||||
selector:
|
selector:
|
||||||
linkerd.io/control-plane-component: linkerd-collector
|
linkerd.io/control-plane-component: linkerd-collector
|
||||||
---
|
---
|
||||||
|
@ -3508,6 +3514,7 @@ spec:
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 55678
|
- containerPort: 55678
|
||||||
- containerPort: 9411
|
- containerPort: 9411
|
||||||
|
- containerPort: 14268
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /
|
path: /
|
||||||
|
|
|
@ -54,6 +54,8 @@ data:
|
||||||
port: 55678
|
port: 55678
|
||||||
zipkin:
|
zipkin:
|
||||||
port: 9411
|
port: 9411
|
||||||
|
jaeger:
|
||||||
|
jaeger-thrift-http-port: 14268
|
||||||
queued-exporters:
|
queued-exporters:
|
||||||
jaeger-all-in-one:
|
jaeger-all-in-one:
|
||||||
num-workers: 4
|
num-workers: 4
|
||||||
|
@ -81,6 +83,10 @@ spec:
|
||||||
port: 9411
|
port: 9411
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
targetPort: 9411
|
targetPort: 9411
|
||||||
|
- name: jaeger
|
||||||
|
port: 14268
|
||||||
|
protocol: TCP
|
||||||
|
targetPort: 14268
|
||||||
selector:
|
selector:
|
||||||
component: oc-collector
|
component: oc-collector
|
||||||
---
|
---
|
||||||
|
@ -127,6 +133,7 @@ spec:
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 55678
|
- containerPort: 55678
|
||||||
- containerPort: 9411
|
- containerPort: 9411
|
||||||
|
- containerPort: 14268
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: oc-collector-config-vol
|
- name: oc-collector-config-vol
|
||||||
mountPath: /conf
|
mountPath: /conf
|
||||||
|
|
Loading…
Reference in New Issue