Merge branch 'main' into main

Signed-off-by: Pavel Nikolov <[email protected]>
jaegertracing · May 23, 2023 · b308c41 · b308c41
2 parents 1cde4b7 + 3584392
commit b308c41
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 7 deletions.
diff --git a/charts/jaeger-operator/COMPATIBILITY.md b/charts/jaeger-operator/COMPATIBILITY.md
@@ -2,6 +2,7 @@ The following table shows the compatibility of `Jaeger Operator helm chart` with
 
 | Chart version             | Jaeger Operator | Kubernetes      | Strimzi Operator   | Cert-Manager |
 |---------------------------|-----------------|-----------------|--------------------|--------------|
+| 2.45.0                    | v1.45.x         | v1.19 to v1.26  | v0.23              | v1.6.1+      |
 | 2.42.0                    | v1.43.x         | v1.19 to v1.26  | v0.23              | v1.6.1+      |
 | 2.41.0                    | v1.42.x         | v1.19 to v1.24  | v0.23              | v1.6.1+      |
 | (Missing)                 |                 | v1.19 to v1.23  | v0.23              | v1.6.1+      |

diff --git a/charts/jaeger-operator/Chart.yaml b/charts/jaeger-operator/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 description: jaeger-operator Helm chart for Kubernetes
 name: jaeger-operator
-version: 2.43.0
-appVersion: 1.43.0
+version: 2.45.0
+appVersion: 1.45.0
 home: https://www.jaegertracing.io/
 icon: https://www.jaegertracing.io/img/jaeger-icon-reverse-color.svg
 sources:

diff --git a/charts/jaeger-operator/README.md b/charts/jaeger-operator/README.md
@@ -58,7 +58,7 @@ The following table lists the configurable parameters of the jaeger-operator cha
 | `serviceExtraLabels`       | Additional labels to jaeger-operator service                                                                | `{}`                            |
 | `extraLabels`              | Additional labels to jaeger-operator deployment                                                             | `{}`                            |
 | `image.repository`         | Controller container image repository                                                                       | `jaegertracing/jaeger-operator` |
-| `image.tag`                | Controller container image tag                                                                              | `1.43.0`                        |
+| `image.tag`                | Controller container image tag                                                                              | `1.45.0`                        |
 | `image.pullPolicy`         | Controller container image pull policy                                                                      | `IfNotPresent`                  |
 | `jaeger.create`            | Jaeger instance will be created                                                                             | `false`                         |
 | `jaeger.spec`              | Jaeger instance specification                                                                               | `{}`                            |

diff --git a/charts/jaeger-operator/values.yaml b/charts/jaeger-operator/values.yaml
@@ -4,7 +4,7 @@
 
 image:
   repository: jaegertracing/jaeger-operator
-  tag: 1.43.0
+  tag: 1.45.0
   pullPolicy: IfNotPresent
   imagePullSecrets: []
 

diff --git a/charts/jaeger/Chart.yaml b/charts/jaeger/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 1.42.0
+appVersion: 1.45.0
 description: A Jaeger Helm chart for Kubernetes
 name: jaeger
 type: application
-version: 0.70.1
+version: 0.71.1
 # CronJobs require v1.21
 kubeVersion: '>= 1.21-0'
 keywords:

diff --git a/charts/jaeger/README.md b/charts/jaeger/README.md
@@ -398,3 +398,31 @@ extraObjects:
       - kind: ServiceAccount
         name: "{{ include \"jaeger.esLookback.serviceAccountName\" . }}"
 ```
+
+## Configuring the hotrod example application to send traces to the OpenTelemetry collector
+
+If the `hotrod` example application is enabled it will export traces to Jaeger
+via the Jaeger exporter. To switch this to another collector and/or protocol,
+such as an OpenTelemetry OTLP Collector, see the example below.
+
+The primary use case of sending the traces to the collector instead of directly
+to Jaeger is to verify traces can get back to Jaeger or another distributed
+tracing store and verify that pipeline with the pre-instrumented hotrod
+application.
+
+**NOTE: This will not install or setup the OpenTelemetry collector. To setup an example OpenTelemetry Collector, see the [OpenTelemetry helm
+charts](https://github.com/open-telemetry/opentelemetry-helm-charts/tree/main/charts/opentelemetry-collector).**
+
+Content of the `jaeger-values.yaml` file:
+
+```YAML
+hotrod:
+  enabled: true
+  # Switch from the jaeger protocol to OTLP
+  extraArgs:
+    - --otel-exporter=otlp
+  # Set the address of the OpenTelemetry collector endpoint
+  extraEnv:
+    - name: OTEL_EXPORTER_OTLP_ENDPOINT
+      value: http://my-otel-collector-opentelemetry-collector:4318
+```
diff --git a/charts/jaeger/templates/allinone-collector-svc.yaml b/charts/jaeger/templates/allinone-collector-svc.yaml
@@ -7,7 +7,7 @@ metadata:
     {{- include "jaeger.labels" . | nindent 4 }}
     app.kubernetes.io/component: service-collector
 spec:
-  clusterIP: None
+  clusterIP: {{ .Values.allInOne.service.headless | ternary "None" "null" }}
   ports:
     - name: http-zipkin
       port: 9411

diff --git a/charts/jaeger/templates/hotrod-deploy.yaml b/charts/jaeger/templates/hotrod-deploy.yaml
@@ -31,11 +31,19 @@ spec:
             {{- toYaml .Values.hotrod.securityContext | nindent 12 }}
           image: {{ .Values.hotrod.image.repository }}:{{- include "jaeger.image.tag" . }}
           imagePullPolicy: {{ .Values.hotrod.image.pullPolicy }}
+          args:
+            {{- toYaml .Values.hotrod.args | nindent 12 }}
+          {{- with .Values.hotrod.extraArgs }}
+            {{- toYaml . | nindent 12 }}
+          {{-  end }}
           env:
             - name: JAEGER_AGENT_HOST
               value: {{ template "jaeger.hotrod.tracing.host" . }}
             - name: JAEGER_AGENT_PORT
               value: {{ .Values.hotrod.tracing.port | quote }}
+          {{- if .Values.hotrod.extraEnv }}
+            {{- toYaml .Values.hotrod.extraEnv | nindent 12 }}
+          {{- end }}
           ports:
             - name: http
               containerPort: 8080

diff --git a/charts/jaeger/values.yaml b/charts/jaeger/values.yaml
@@ -31,6 +31,8 @@ allInOne:
   #       "param": 1
   #     }
   #   }
+  service:
+    headless: true
   ingress:
     enabled: false
     # For Kubernetes >= 1.18 you should specify the ingress-controller via the field ingressClassName
@@ -804,6 +806,17 @@ hotrod:
   podSecurityContext: {}
   securityContext: {}
   replicaCount: 1
+  # set the primary command(s) for the hotrod application
+  args:
+    - all
+  # add extra arguments to the hotrod application to customize tracing
+  extraArgs: []
+  #   - --otel-exporter=otlp
+  #   - --jaeger-ui=http://jaeger.chart.local
+  # add extra environment variables to the hotrod application
+  extraEnv: []
+  #   - name: OTEL_EXPORTER_OTLP_ENDPOINT
+  #     value: http://my-otel-collector.chart.local:4318
   image:
     repository: jaegertracing/example-hotrod
     pullPolicy: IfNotPresent