Helm chart - linkerd2-collector : enable jaeger receiver (#4783)

Fixes #4778

Signed-off-by: Olivier Boudet <o.boudet@gmail.com>

charts/add-ons/tracing/templates/tracing.yaml

@@ -20,6 +20,8 @@ data:
         port: 55678
       zipkin:
         port: 9411
+      jaeger:
+        jaeger-thrift-http-port: 14268
     queued-exporters:
       jaeger-all-in-one:
         num-workers: 4
@@ -51,6 +53,10 @@ spec:
     port: 9411
     protocol: TCP
     targetPort: 9411
+  - name: jaeger
+    port: 14268
+    protocol: TCP
+    targetPort: 14268
   selector:
     {{.Values.global.controllerComponentLabel}}: linkerd-collector
 ---
@@ -110,6 +116,7 @@ spec:
         ports:
         - containerPort: 55678
         - containerPort: 9411
+        - containerPort: 14268
         readinessProbe:
           httpGet:
             path: /

charts/linkerd2/requirements.lock

@@ -12,4 +12,4 @@ dependencies:
   repository: file://../add-ons/tracing
   version: 0.1.0
 digest: sha256:d2428770ae7d5134c5af6521c78a4c5f95da4c75f21bdea0f74fad6ab6e2e044
-generated: "2020-06-24T11:07:53.924602129Z"
+generated: "2020-07-23T14:47:05.936935407+02:00"

cli/cmd/testdata/install_addon_control-plane.golden

@@ -2550,6 +2550,8 @@ data:
         port: 55678
       zipkin:
         port: 9411
+      jaeger:
+        jaeger-thrift-http-port: 14268
     queued-exporters:
       jaeger-all-in-one:
         num-workers: 4
@@ -2581,6 +2583,10 @@ spec:
     port: 9411
     protocol: TCP
     targetPort: 9411
+  - name: jaeger
+    port: 14268
+    protocol: TCP
+    targetPort: 14268
   selector:
     linkerd.io/control-plane-component: linkerd-collector
 ---
@@ -2638,6 +2644,7 @@ spec:
         ports:
         - containerPort: 55678
         - containerPort: 9411
+        - containerPort: 14268
         readinessProbe:
           httpGet:
             path: /

cli/cmd/testdata/install_helm_output_addons.golden

@@ -3456,6 +3456,8 @@ data:
         port: 55678
       zipkin:
         port: 9411
+      jaeger:
+        jaeger-thrift-http-port: 14268
     queued-exporters:
       jaeger-all-in-one:
         num-workers: 4
@@ -3487,6 +3489,10 @@ spec:
     port: 9411
     protocol: TCP
     targetPort: 9411
+  - name: jaeger
+    port: 14268
+    protocol: TCP
+    targetPort: 14268
   selector:
     linkerd.io/control-plane-component: linkerd-collector
 ---
@@ -3544,6 +3550,7 @@ spec:
         ports:
         - containerPort: 55678
         - containerPort: 9411
+        - containerPort: 14268
         readinessProbe:
           httpGet:
             path: /

cli/cmd/testdata/install_tracing.golden

@@ -3418,6 +3418,8 @@ data:
         port: 55678
       zipkin:
         port: 9411
+      jaeger:
+        jaeger-thrift-http-port: 14268
     queued-exporters:
       jaeger-all-in-one:
         num-workers: 4
@@ -3449,6 +3451,10 @@ spec:
     port: 9411
     protocol: TCP
     targetPort: 9411
+  - name: jaeger
+    port: 14268
+    protocol: TCP
+    targetPort: 14268
   selector:
     linkerd.io/control-plane-component: linkerd-collector
 ---
@@ -3506,6 +3512,7 @@ spec:
         ports:
         - containerPort: 55678
         - containerPort: 9411
+        - containerPort: 14268
         readinessProbe:
           httpGet:
             path: /

cli/cmd/testdata/install_tracing_overwrite.golden

@@ -3420,6 +3420,8 @@ data:
         port: 55678
       zipkin:
         port: 9411
+      jaeger:
+        jaeger-thrift-http-port: 14268
     queued-exporters:
       jaeger-all-in-one:
         num-workers: 4
@@ -3451,6 +3453,10 @@ spec:
     port: 9411
     protocol: TCP
     targetPort: 9411
+  - name: jaeger
+    port: 14268
+    protocol: TCP
+    targetPort: 14268
   selector:
     linkerd.io/control-plane-component: linkerd-collector
 ---
@@ -3508,6 +3514,7 @@ spec:
         ports:
         - containerPort: 55678
         - containerPort: 9411
+        - containerPort: 14268
         readinessProbe:
           httpGet:
             path: /

test/integration/tracing/testdata/tracing.yaml

@@ -54,6 +54,8 @@ data:
         port: 55678
       zipkin:
         port: 9411
+      jaeger:
+        jaeger-thrift-http-port: 14268
     queued-exporters:
       jaeger-all-in-one:
         num-workers: 4
@@ -81,6 +83,10 @@ spec:
     port: 9411
     protocol: TCP
     targetPort: 9411
+  - name: jaeger
+    port: 14268
+    protocol: TCP
+    targetPort: 14268
   selector:
     component: oc-collector
 ---
@@ -127,6 +133,7 @@ spec:
         ports:
         - containerPort: 55678
         - containerPort: 9411
+        - containerPort: 14268
         volumeMounts:
         - name: oc-collector-config-vol
           mountPath: /conf