Jaeger v2 with v1

.github/workflows/lint-test.yaml

@@ -38,7 +38,7 @@ jobs:
       - name: Run chart-testing (lint)
         run: ct lint --config ct.yaml
 
-  test-with-cassandra:
+  test-with-all-in-one:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -47,43 +47,31 @@ jobs:
 
       - uses: ./.github/actions/prepare-k8s
 
-      - name: Run cassandra-chart-testing (install)
-        run: ct install --config ct.yaml
-  test-with-allInOne:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - uses: ./.github/actions/prepare-k8s
-
-      - name: Run allInOne-chart-testing (install)
+      - name: Run chart-testing (install)
         run: |
-          ct install --config ct.yaml --helm-extra-set-args "
-            --set provisionDataStore.cassandra=false
-            --set storage.type=memory
-            --set allInOne.enabled=true
-            --set agent.enabled=false
-            --set collector.enabled=false
-            --set query.enabled=false"
+          ct install --config ct.yaml 
   test-with-elasticsearch:
-    runs-on: ubuntu-latest
-    steps:
+      runs-on: ubuntu-latest
+      steps:
         - uses: actions/checkout@v2
           with:
             fetch-depth: 0
 
         - uses: ./.github/actions/prepare-k8s
 
-        - name: Run elasticsearch-chart-testing (install)
+        - name: Run chart-testing (install)
           run: |
-            ct install --config ct.yaml --helm-extra-set-args "
-              --set provisionDataStore.cassandra=false
-              --set provisionDataStore.elasticsearch=true
-              --set storage.type=elasticsearch
-              --set elasticsearch.master.masterOnly=false
-              --set elasticsearch.master.replicaCount=1
-              --set elasticsearch.data.replicaCount=0
-              --set elasticsearch.coordinating.replicaCount=0
-              --set elasticsearch.ingest.replicaCount=0"
+            ct install --config ct.yaml \
+                --helm-extra-set-args " \
+                --set provisionDataStore.elasticsearch=true \
+                --set allInOne.enabled=false \
+                --set storage.type=elasticsearch \
+                --set elasticsearch.master.masterOnly=false \
+                --set elasticsearch.master.replicaCount=1 \
+                --set elasticsearch.data.replicaCount=0 \
+                --set elasticsearch.coordinating.replicaCount=0 \
+                --set elasticsearch.ingest.replicaCount=0
+                --set agent.enabled=true \
+                --set collector.enabled=true \
+                --set query.enabled=true"
+

charts/jaeger/Chart.yaml

@@ -1,9 +1,11 @@
 apiVersion: v2
-appVersion: 1.53.0
+appVersion: 2.0.0-rc2
 description: A Jaeger Helm chart for Kubernetes
 name: jaeger
 type: application
-version: 3.3.2
+version: 4.0.0
+annotations:
+  Jaegerv1Version: "1.62.0"
 # CronJobs require v1.21
 kubeVersion: ">= 1.21-0"
 keywords:
@@ -16,8 +18,6 @@ icon: https://www.jaegertracing.io/img/jaeger-icon-reverse-color.svg
 sources:
   - https://hub.docker.com/u/jaegertracing/
 maintainers:
-  - name: dvonthenen
-    email: david.vonthenen@dell.com
   - name: mehta-ankit
     email: ankit.mehta@appian.com
   - name: mikelorant

charts/jaeger/README-v2.md

@@ -0,0 +1,109 @@
+
+---
+
+# Jaeger Helm-chart Documentation
+
+## Overview
+This documentation provides step-by-step setup and configuration instructions for running Jaeger in various modes, with sections for both the `all-in-one` mode and the `Elasticsearch` configuration, followed by details on optional `--set` flags for custom configurations.
+
+---
+
+### 1. Jaeger All-in-One Mode
+
+Jaeger’s all-in-one mode combines the Jaeger Agent, Collector, and Query into a single pod for simplicity. Use this mode for testing or lightweight deployments.
+
+#### **Command to Run All-in-One**
+
+```bash
+helm install <chart_name> charts/jaeger \
+    --set-file userconfig=path/to/configfile.yaml # Optional: user-specific config
+```
+
+- **Flags Explained**:
+  - `provisionDataStore.cassandra=false`: Disable Cassandra provision.
+  - `storage.type=memory`: Use in-memory storage (non-persistent).
+  - `allInOne.enabled=true`: Enable the all-in-one Jaeger setup.
+  - `agent.enabled=false`, `collector.enabled=false`, `query.enabled=false`: Disable separate components since they’re embedded in all-in-one.
+  - `userconfig`: Optional file for additional configuration.
+
+
+---
+
+### 2. Elasticsearch Mode with Provisioned Data Store
+
+This mode configures Jaeger to store trace data in an Elasticsearch backend, suitable for production-level usage. 
+
+#### **Command to Run with Elasticsearch**
+
+1. **Single Master Node Configuration**  
+   For a basic setup with only one Elasticsearch master node, use this command:
+
+   ```bash
+   helm install <chart_name> charts/jaeger \
+       --set provisionDataStore.elasticsearch=true \
+       --set allInOne.enabled=false \
+       --set storage.type=elasticsearch \
+       --set elasticsearch.master.masterOnly=false \
+       --set elasticsearch.master.replicaCount=1 \
+       --set elasticsearch.data.replicaCount=0 \
+       --set elasticsearch.coordinating.replicaCount=0 \
+       --set elasticsearch.ingest.replicaCount=0
+       --set agent.enabled=true \
+       --set collector.enabled=true \
+       --set query.enabled=true
+       --set-file userconfig=path/to/configfile.yaml # Optional: user-specific config
+   ```
+
+2. **Default Configuration**  
+   For a more straightforward setup with default Elasticsearch configuration, use:
+
+   ```bash
+   helm install <chart_name> charts/jaeger \
+       --set provisionDataStore.elasticsearch=true \
+       --set allInOne.enabled=false \
+       --set storage.type=elasticsearch \
+       --set agent.enabled=true \
+       --set collector.enabled=true \
+       --set query.enabled=true
+       --set-file userconfig=path/to/configfile.yaml # Optional: user-specific config
+   ```
+
+- **Flags Explained**:
+  - `provisionDataStore.cassandra=false`: Disable Cassandra provision.
+  - `provisionDataStore.elasticsearch=true`: Enable Elasticsearch as the storage.
+  - `storage.type=elasticsearch`: Use Elasticsearch for storage.
+  - **Single Master Node Settings** (optional for simplified configuration):
+    - `elasticsearch.master.masterOnly=false`
+    - `elasticsearch.master.replicaCount=1`
+    - `elasticsearch.data.replicaCount=0`
+    - `elasticsearch.coordinating.replicaCount=0`
+    - `elasticsearch.ingest.replicaCount=0`
+  - `userconfig`: Optional file for additional configuration.
+
+--- 
+
+
+### 3. Additional `--set` Configuration Options
+
+For custom configurations, the following flags are commonly used. These cover primary Elasticsearch storage settings and additional archive configurations.
+
+#### **Primary Storage Settings**
+- `.Values.config.extensions.jaeger_storage.backends.primary_store.elasticsearch.index_prefix`: Set the prefix for Elasticsearch indices.
+- `.Values.config.extensions.jaeger_storage.backends.primary_store.elasticsearch.host`: Specify the Elasticsearch host.
+- `.Values.config.extensions.jaeger_storage.backends.primary_store.elasticsearch.user`: Username for Elasticsearch authentication.
+- `.Values.config.extensions.jaeger_storage.backends.primary_store.elasticsearch.password`: Password for Elasticsearch authentication.
+
+Here’s the updated documentation with the archive storage settings referenced and with similar flags specified for archive configurations.
+
+
+#### **Archive Storage Settings**
+- Similar flags for archive configurations can be used to manage archived trace data. 
+
+The `values.yaml` file shows archive configurations under `jaeger_storage` with the `archive_store` section for Elasticsearch. You can configure these with the following flags:
+
+- `.Values.config.extensions.jaeger_storage.backends.archive_store.elasticsearch.index_prefix`
+- `.Values.config.extensions.jaeger_storage.backends.archive_store.elasticsearch.server_urls`
+- `.Values.config.extensions.jaeger_storage.backends.archive_store.elasticsearch.username`
+- `.Values.config.extensions.jaeger_storage.backends.archive_store.elasticsearch.password`
+
+---

charts/jaeger/templates/_helpers.tpl

@@ -563,14 +563,14 @@ If not tag is provided, it defaults to .Chart.AppVersion.
 {{- end -}}
 
 {{/*
-Create image name for all in one image
+Create image name for all-in-one image
 */}}
 {{- define "allInOne.image" -}}
 {{- include "renderImage" ( dict "imageRoot" .Values.allInOne.image "context" $ ) -}}
 {{- end -}}
 
 {{/*
-Create pull secrets for all in one image
+Create pull secrets for all-in-one image
 */}}
 {{- define "allInOne.imagePullSecrets" -}}
 {{- include "common.images.renderPullSecrets" (dict "images" (list .Values.allInOne.image) "context" $) -}}
@@ -608,7 +608,8 @@ Create pull secrets for ingester image
 Create image name for agent image
 */}}
 {{- define "agent.image" -}}
-{{- include "renderImage" ( dict "imageRoot" .Values.agent.image "context" $ ) -}}
+{{- $image := merge .Values.agent.image (dict "tag" .Chart.Annotations.Jaegerv1Version) -}}
+{{- include "renderImage" ( dict "imageRoot" $image "context" $ ) -}}
 {{- end -}}
 
 {{/*
@@ -723,3 +724,78 @@ Create pull secrets for hotrod image
 {{- define "hotrod.imagePullSecrets" -}}
 {{- include "common.images.renderPullSecrets" (dict "images" (list .Values.hotrod.image) "context" $) -}}
 {{- end }}
+
+
+{{- define "jaeger.extensionsConfig" -}}
+{{- if .Values.extensions }}
+{{ toYaml .Values.extensions | nindent 6 }}
+{{- else }}
+{{ toYaml .Values.config.extensions | nindent 6 }}
+{{- end }}
+{{- end }}
+
+{{- define "jaeger.receiversConfig" -}}
+{{- if .Values.receivers }}
+{{ toYaml .Values.receivers | nindent 6 }}
+{{- else }}
+{{ toYaml .Values.config.receivers | nindent 6 }}
+{{- end }}
+{{- end }}
+
+{{- define "jaeger.processorsConfig" -}}
+{{- if .Values.processors }}
+{{ toYaml .Values.processors | nindent 6 }}
+{{- else }}
+{{ toYaml .Values.config.processors | nindent 6 }}
+{{- end }}
+{{- end }}
+
+{{- define "jaeger.exportersConfig" -}}
+{{- if .Values.exporters }}
+{{ toYaml .Values.exporters | nindent 6 }}
+{{- else }}
+{{ toYaml .Values.config.exporters | nindent 6 }}
+{{- end }}
+{{- end }}
+
+
+
+{{- define "jaeger.serviceExtensions" -}}
+{{- if and .Values.service .Values.service.extensions -}}
+[{{ join ", " .Values.service.extensions }}]
+{{- else -}}
+[{{ join ", " .Values.config.service.extensions }}]
+{{- end -}}
+{{- end }}
+
+{{- define "jaeger.serviceReceivers" -}}
+{{- if and .Values.service .Values.service.pipelines .Values.service.pipelines.traces .Values.service.pipelines.traces.receivers -}}
+[{{ join ", " .Values.service.pipelines.traces.receivers }}]
+{{- else -}}
+[{{ join ", " .Values.config.service.pipelines.traces.receivers }}]
+{{- end -}}
+{{- end }}
+
+{{- define "jaeger.serviceProcessors" -}}
+{{- if and .Values.service .Values.service.pipelines .Values.service.pipelines.traces .Values.service.pipelines.traces.processors -}}
+[{{ join ", " .Values.service.pipelines.traces.processors }}]
+{{- else -}}
+[{{ join ", " .Values.config.service.pipelines.traces.processors }}]
+{{- end -}}
+{{- end }}
+
+{{- define "jaeger.serviceExporters" -}}
+{{- if and .Values.service .Values.service.pipelines .Values.service.pipelines.traces .Values.service.pipelines.traces.exporters -}}
+[{{ join ", " .Values.service.pipelines.traces.exporters }}]
+{{- else -}}
+[{{ join ", " .Values.config.service.pipelines.traces.exporters }}]
+{{- end -}}
+{{- end }}
+
+{{- define "jaeger.namespace" -}}
+  {{- if .Values.namespaceOverride -}}
+    {{- .Values.namespaceOverride -}}
+  {{- else -}}
+    {{- .Release.Namespace -}}
+  {{- end -}}
+{{- end -}}

charts/jaeger/templates/allinone-deploy.yaml

@@ -58,6 +58,10 @@ spec:
           imagePullPolicy: {{ .Values.allInOne.image.pullPolicy }}
           name: jaeger
           args:
+            {{ if .Values.userconfig }}
+             - "--config"
+             - "/etc/jaeger/user-config.yaml"
+            {{- end }}
             {{- range $arg := .Values.allInOne.args }}
             - "{{ tpl $arg $ }}"
             {{- end }}
@@ -80,11 +84,13 @@ spec:
               protocol: TCP
             - containerPort: 4318
               protocol: TCP
+            - containerPort: 13133
+              protocol: TCP
           livenessProbe:
             failureThreshold: 5
             httpGet:
-              path: /
-              port: 14269
+              path: /status
+              port: 13133
               scheme: HTTP
             initialDelaySeconds: 5
             periodSeconds: 15
@@ -93,8 +99,8 @@ spec:
           readinessProbe:
             failureThreshold: 3
             httpGet:
-              path: /
-              port: 14269
+              path: /status
+              port: 13133
               scheme: HTTP
             initialDelaySeconds: 1
             periodSeconds: 10
@@ -105,6 +111,10 @@ spec:
         {{- toYaml . | nindent 12 }}
       {{- end }}
           volumeMounts:
+        {{ if .Values.userconfig }}  
+            - name: user-config
+              mountPath: /etc/jaeger
+        {{- end }}
         {{- if not .Values.storage.badger.ephemeral }}
             - name: badger-data
               mountPath: {{ .Values.storage.badger.persistence.mountPath }}
@@ -123,6 +133,11 @@ spec:
         {{- toYaml .Values.allInOne.podSecurityContext | nindent 8 }}
       serviceAccountName: {{ template "jaeger.fullname" . }}
       volumes:
+      {{ if .Values.userconfig }}
+         - name: user-config
+           configMap:
+            name: user-config
+      {{- end }}
     {{- if not .Values.storage.badger.ephemeral }}
         - name: badger-data
           persistentVolumeClaim: