From 8fed14328ee17b525915a5e799daf57ec4137e1e Mon Sep 17 00:00:00 2001
From: Mehul <mehulsharma4786@gmail.com>
Date: Tue, 1 Oct 2024 15:49:30 +0000
Subject: [PATCH 01/24] added all-in-one deployment and configmap for jaeger-v2

Signed-off-by: Mehul <mehulsharma4786@gmail.com>
---
 charts/jaeger-v2/.helmignore               |  21 +++
 charts/jaeger-v2/Chart.lock                |  15 ++
 charts/jaeger-v2/Chart.yaml                |  46 ++++++
 charts/jaeger-v2/readme.md                 | 167 +++++++++++++++++++++
 charts/jaeger-v2/templates/_helpers.tpl    |  62 ++++++++
 charts/jaeger-v2/templates/config-map.yaml |  35 +++++
 charts/jaeger-v2/templates/deployment.yaml |  46 ++++++
 charts/jaeger-v2/values.yaml               |  71 +++++++++
 8 files changed, 463 insertions(+)
 create mode 100644 charts/jaeger-v2/.helmignore
 create mode 100644 charts/jaeger-v2/Chart.lock
 create mode 100644 charts/jaeger-v2/Chart.yaml
 create mode 100644 charts/jaeger-v2/readme.md
 create mode 100644 charts/jaeger-v2/templates/_helpers.tpl
 create mode 100644 charts/jaeger-v2/templates/config-map.yaml
 create mode 100644 charts/jaeger-v2/templates/deployment.yaml
 create mode 100644 charts/jaeger-v2/values.yaml

diff --git a/charts/jaeger-v2/.helmignore b/charts/jaeger-v2/.helmignore
new file mode 100644
index 00000000..f0c13194
--- /dev/null
+++ b/charts/jaeger-v2/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/charts/jaeger-v2/Chart.lock b/charts/jaeger-v2/Chart.lock
new file mode 100644
index 00000000..89e13342
--- /dev/null
+++ b/charts/jaeger-v2/Chart.lock
@@ -0,0 +1,15 @@
+dependencies:
+- name: cassandra
+  repository: https://charts.helm.sh/incubator
+  version: 0.15.3
+- name: elasticsearch
+  repository: https://charts.bitnami.com/bitnami
+  version: 20.0.4
+- name: kafka
+  repository: https://charts.bitnami.com/bitnami
+  version: 26.6.2
+- name: common
+  repository: https://charts.bitnami.com/bitnami
+  version: 2.23.0
+digest: sha256:b13c6270d6d45478b47d03157f7a1c44add98be0809d83b22597a0c800781c10
+generated: "2024-10-01T10:23:03.372102011Z"
diff --git a/charts/jaeger-v2/Chart.yaml b/charts/jaeger-v2/Chart.yaml
new file mode 100644
index 00000000..7b103ab6
--- /dev/null
+++ b/charts/jaeger-v2/Chart.yaml
@@ -0,0 +1,46 @@
+apiVersion: v2
+appVersion: 1.53.0
+description: A Jaeger Helm chart for Kubernetes
+name: jaeger
+type: application
+version: 3.3.1
+# CronJobs require v1.21
+kubeVersion: ">= 1.21-0"
+keywords:
+  - jaeger
+  - opentracing
+  - tracing
+  - instrumentation
+home: https://jaegertracing.io
+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
+    email: michael.lorant@fairfaxmedia.com.au
+  - name: naseemkullah
+    email: naseem@transit.app
+  - name: pavelnikolov
+    email: me@pavelnikolov.net
+  - name: jkowall
+    email: jkowall@kowall.net
+dependencies:
+  - name: cassandra
+    version: 0.15.3
+    repository: https://charts.helm.sh/incubator
+    condition: provisionDataStore.cassandra
+  - name: elasticsearch
+    version: 20.0.4
+    repository: https://charts.bitnami.com/bitnami
+    condition: provisionDataStore.elasticsearch
+  - name: kafka
+    version: 26.6.2
+    repository: https://charts.bitnami.com/bitnami
+    condition: provisionDataStore.kafka
+  - name: common
+    repository: https://charts.bitnami.com/bitnami
+    version: 2.x.x
diff --git a/charts/jaeger-v2/readme.md b/charts/jaeger-v2/readme.md
new file mode 100644
index 00000000..4d2954cb
--- /dev/null
+++ b/charts/jaeger-v2/readme.md
@@ -0,0 +1,167 @@
+# Jaeger Helm Chart Deployment (Version 2) Documentation
+
+## Overview
+
+This document outlines the steps to deploy the Jaeger Helm chart (version 2) and provides information on how to use a custom `values.yaml` configuration file during installation. The Jaeger Helm chart includes multiple sub-charts for data stores like Cassandra, Elasticsearch, and Kafka.
+
+## Directory Structure
+
+The structure of the Jaeger Helm chart is as follows:
+
+```bash
+kali@PC:~/LFX/helm-charts/charts/jaeger-v2$ tree
+.
+├── Chart.lock
+├── Chart.yaml
+├── charts
+│   ├── cassandra-0.15.3.tgz
+│   ├── common-2.23.0.tgz
+│   ├── elasticsearch-20.0.4.tgz
+│   └── kafka-26.6.2.tgz
+├── readme.md
+├── templates
+│   ├── _helpers.tpl
+│   ├── config-map.yaml
+│   └── deployment.yaml
+└── values.yaml
+
+3 directories, 11 files
+```
+
+### Key Files
+- **Chart.yaml**: Contains metadata about the Helm chart such as the chart version, name, and dependencies.
+- **templates/**: This directory contains Kubernetes manifests that are templated by Helm and used for the deployment of the Jaeger application. Key templates include:
+  - `config-map.yaml`: Configures the ConfigMap for the application.
+  - `deployment.yaml`: Contains the template for the Kubernetes deployment of Jaeger.
+- **values.yaml**: This file contains default configuration values for the chart, which are applied unless overridden by a custom file.
+- **charts/**: Contains Helm chart dependencies such as Cassandra, Elasticsearch, Kafka, and common utilities.
+- **readme.md**: Provides chart-specific documentation.
+
+## Helm Installation
+
+You can install the Jaeger Helm chart with the following commands:
+
+### Basic Installation
+
+To install the Jaeger chart using the default values from the included `values.yaml`:
+
+```bash
+helm install <chart_name> ./
+```
+
+- `<chart_name>` is the name you want to give your release.
+
+### Installation with Custom Values
+
+If you want to use a custom configuration, you can pass a custom `values.yaml` file. This allows you to override the default values specified in the chart’s `values.yaml`.
+
+Use the following command to install the chart with a custom values file:
+
+```bash
+helm install <chart_name> ./ -f <custom_values.yaml>
+```
+
+- Replace `<chart_name>` with the desired name for your Helm release.
+- Replace `<custom_values.yaml>` with the path to your custom configuration file.
+
+### Example:
+
+```bash
+helm install jaeger-v2 ./ -f my-config-values.yaml
+```
+
+This command installs the Jaeger chart and uses `my-config-values.yaml` for overriding any configuration specified in the default `values.yaml`.
+
+## Custom Values
+
+When deploying Jaeger using a custom values file, any configuration set in the file will take precedence over the default settings in `values.yaml`. For example, you can modify parameters for `receivers`, `processors`, `exporters`, and more within your custom values file.
+
+### Example Custom `values.yaml`
+
+```yaml
+
+    service:
+      extensions: [jaeger_storage, jaeger_query, remote_sampling, healthcheckv2]
+      pipelines:
+        traces:
+          receivers: [otlp, jaeger, zipkin]
+          processors: [batch, adaptive_sampling]
+          exporters: [jaeger_storage_exporter]
+
+    extensions:
+      healthcheckv2:
+        use_v2: true
+        http: {}
+
+
+      jaeger_query:
+        storage:
+          traces: some_store
+          traces_archive: another_store
+        ui:
+          config_file: ./cmd/jaeger/config-ui.json
+
+      jaeger_storage:
+        backends:
+          some_store:
+            memory:
+              max_traces: 90000
+          another_store:
+            memory:
+              max_traces: 90000
+
+      remote_sampling:
+        adaptive:
+          sampling_store: some_store
+          initial_sampling_probability: 0.2
+        http: {}
+        grpc: {}
+
+    receivers:
+      otlp:
+        protocols:
+          grpc: {}
+          http: {}
+
+      jaeger:
+        protocols:
+          grpc: {}
+          thrift_binary: {}
+          thrift_compact: {}
+          thrift_http: {}
+
+      zipkin: {}
+
+    processors:
+      batch: {}
+      adaptive_sampling: {}
+
+    exporters:
+      jaeger_storage_exporter:
+        trace_storage: some_store
+```
+
+## Dependencies
+
+This Helm chart comes with pre-packaged dependencies for data stores:
+- **Cassandra**: Version `0.15.3`
+- **Elasticsearch**: Version `20.0.4`
+- **Kafka**: Version `26.6.2`
+- **Common**: Version `2.23.0`
+
+These dependencies can be managed through the `charts/` directory, and they are installed as part of the Jaeger deployment.
+
+## Uninstallation
+
+To uninstall the Helm release, use the following command:
+
+```bash
+helm uninstall <chart_name>
+```
+
+This will remove all Kubernetes resources created by the chart, including ConfigMaps, Deployments, Services, and StatefulSets.
+
+## Conclusion
+
+This document provides a summary of how to install and configure the Jaeger Helm chart (version 2) with both default and custom values. Custom configurations can be applied via a user-defined `values.yaml` file using the `-f` flag during installation.# Jaeger Helm Chart Deployment (Version 2) Documentation
+
diff --git a/charts/jaeger-v2/templates/_helpers.tpl b/charts/jaeger-v2/templates/_helpers.tpl
new file mode 100644
index 00000000..84836006
--- /dev/null
+++ b/charts/jaeger-v2/templates/_helpers.tpl
@@ -0,0 +1,62 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "jaeger-v2.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "jaeger-v2.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "jaeger-v2.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "jaeger-v2.labels" -}}
+helm.sh/chart: {{ include "jaeger-v2.chart" . }}
+{{ include "jaeger-v2.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "jaeger-v2.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "jaeger-v2.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "jaeger-v2.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "jaeger-v2.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
diff --git a/charts/jaeger-v2/templates/config-map.yaml b/charts/jaeger-v2/templates/config-map.yaml
new file mode 100644
index 00000000..c3ba5821
--- /dev/null
+++ b/charts/jaeger-v2/templates/config-map.yaml
@@ -0,0 +1,35 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: my-config
+  namespace: default
+data:
+  config.yaml: |
+    service:
+      extensions: {{ toYaml .Values.service.extensions | indent 6 }}
+      pipelines:
+        traces:
+          receivers: {{ toYaml .Values.service.pipelines.traces.receivers | indent 10 }}
+          processors: {{ toYaml .Values.service.pipelines.traces.processors | indent 10 }}
+          exporters: {{ toYaml .Values.service.pipelines.traces.exporters | indent 10 }}
+
+    extensions:
+      healthcheckv2: {{ toYaml .Values.extensions.healthcheckv2 | indent 6 }}
+
+      jaeger_query:
+        storage: {{ toYaml .Values.extensions.jaeger_query.storage | indent 8 }}
+        ui: {{ toYaml .Values.extensions.jaeger_query.ui | indent 8 }}
+      jaeger_storage: {{ toYaml .Values.extensions.jaeger_storage | indent 6 }}
+      remote_sampling: {{ toYaml .Values.extensions.remote_sampling | indent 6 }}
+
+    receivers:
+      otlp: {{ toYaml .Values.receivers.otlp | indent 6 }}
+      jaeger: {{ toYaml .Values.receivers.jaeger | indent 6 }}
+      zipkin: {{ toYaml .Values.receivers.zipkin | indent 6 }}
+
+    processors:
+      batch: {{ toYaml .Values.processors.batch | indent 6 }}
+      adaptive_sampling: {{ toYaml .Values.processors.adaptive_sampling | indent 6 }}
+
+    exporters:
+      jaeger_storage_exporter: {{ toYaml .Values.exporters.jaeger_storage_exporter | indent 6 }}
\ No newline at end of file
diff --git a/charts/jaeger-v2/templates/deployment.yaml b/charts/jaeger-v2/templates/deployment.yaml
new file mode 100644
index 00000000..0fe8cf91
--- /dev/null
+++ b/charts/jaeger-v2/templates/deployment.yaml
@@ -0,0 +1,46 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: jaeger
+  labels:
+    app: jaeger
+spec: 
+  replicas: 1
+  selector:
+    matchLabels:
+      app: jaeger
+  template:
+    metadata:
+      labels:
+        app: jaeger
+    spec:
+      containers:
+        - name: jaeger
+          image: jaegertracing/jaeger:latest
+
+          ports:
+            - containerPort: 16686
+              name: ui
+            - containerPort: 14268
+              name: collector
+            - containerPort: 14250
+              name: grpc
+            - containerPort: 9411
+              name: zipkin
+          env:
+            - name: COLLECTOR_ZIPKIN_HOST_PORT
+              value: ":9411"
+          resources:   # Corrected the typo here
+            limits:
+              cpu: 500m
+              memory: 512Mi
+            requests:
+              cpu: 100m
+              memory: 256Mi
+          volumeMounts:
+            - name: config-volume
+              mountPath: /etc/jaeger
+      volumes:
+        - name: config-volume
+          configMap:
+            name: my-config
\ No newline at end of file
diff --git a/charts/jaeger-v2/values.yaml b/charts/jaeger-v2/values.yaml
new file mode 100644
index 00000000..af0e338f
--- /dev/null
+++ b/charts/jaeger-v2/values.yaml
@@ -0,0 +1,71 @@
+
+  service:
+    extensions: [jaeger_storage, jaeger_query, remote_sampling, healthcheckv2]
+    pipelines:
+      traces:
+        receivers: [otlp, jaeger, zipkin]
+        processors: [batch, adaptive_sampling]
+        exporters: [jaeger_storage_exporter]
+
+  extensions:
+    healthcheckv2:
+      use_v2: true
+      http: {}
+
+    jaeger_query:
+      storage:
+        traces: some_store
+        traces_archive: another_store
+      ui:
+        config_file: ./cmd/jaeger/config-ui.json
+
+    jaeger_storage:
+      backends:
+        some_store:
+          memory:
+            max_traces: 100000
+        another_store:
+          memory:
+            max_traces: 100000
+
+    remote_sampling:
+      adaptive:
+        sampling_store: some_store
+        initial_sampling_probability: 0.1
+      http: {}
+      grpc: {}
+
+  receivers:
+    otlp:
+      protocols:
+        grpc: {}
+        http: {}
+
+    jaeger:
+      protocols:
+        grpc: {}
+        thrift_binary: {}
+        thrift_compact: {}
+        thrift_http: {}
+
+    zipkin: {}
+
+  processors:
+    batch: {}
+    adaptive_sampling: {}
+
+  exporters:
+    jaeger_storage_exporter: {}
+
+image: "jaegertracing/jaeger:latest"
+ports:
+  - name: http
+    port: 4317
+  - name: grpc
+    port: 4318
+
+provisionDataStore:
+  cassandra: false
+  elasticsearch: false
+  kafka: false
+

From 783ab93d8d94ce445e3efbdb544dcd734ace5c8d Mon Sep 17 00:00:00 2001
From: Mehul <mehulsharma4786@gmail.com>
Date: Tue, 1 Oct 2024 16:54:13 +0000
Subject: [PATCH 02/24] lint fix

Signed-off-by: Mehul <mehulsharma4786@gmail.com>
---
 charts/jaeger-v2/values.yaml | 100 ++++++++++++++++-------------------
 1 file changed, 47 insertions(+), 53 deletions(-)

diff --git a/charts/jaeger-v2/values.yaml b/charts/jaeger-v2/values.yaml
index af0e338f..15b12550 100644
--- a/charts/jaeger-v2/values.yaml
+++ b/charts/jaeger-v2/values.yaml
@@ -1,68 +1,62 @@
+service:
+  extensions: [jaeger_storage, jaeger_query, remote_sampling, healthcheckv2]
+  pipelines:
+    traces:
+      receivers: [otlp, jaeger, zipkin]
+      processors: [batch, adaptive_sampling]
+      exporters: [jaeger_storage_exporter]
 
-  service:
-    extensions: [jaeger_storage, jaeger_query, remote_sampling, healthcheckv2]
-    pipelines:
-      traces:
-        receivers: [otlp, jaeger, zipkin]
-        processors: [batch, adaptive_sampling]
-        exporters: [jaeger_storage_exporter]
+extensions:
+  healthcheckv2:
+    use_v2: true
+    http: {}
 
-  extensions:
-    healthcheckv2:
-      use_v2: true
-      http: {}
+  jaeger_query:
+    storage:
+      traces: some_store
+      traces_archive: another_store
+    ui:
+      config_file: ./cmd/jaeger/config-ui.json
 
-    jaeger_query:
-      storage:
-        traces: some_store
-        traces_archive: another_store
-      ui:
-        config_file: ./cmd/jaeger/config-ui.json
+  jaeger_storage:
+    backends:
+      some_store:
+        memory:
+          max_traces: 100000
+      another_store:
+        memory:
+          max_traces: 100000
 
-    jaeger_storage:
-      backends:
-        some_store:
-          memory:
-            max_traces: 100000
-        another_store:
-          memory:
-            max_traces: 100000
+  remote_sampling:
+    adaptive:
+      sampling_store: some_store
+      initial_sampling_probability: 0.1
+    http: {}
+    grpc: {}
 
-    remote_sampling:
-      adaptive:
-        sampling_store: some_store
-        initial_sampling_probability: 0.1
-      http: {}
+receivers:
+  otlp:
+    protocols:
       grpc: {}
+      http: {}
 
-  receivers:
-    otlp:
-      protocols:
-        grpc: {}
-        http: {}
-
-    jaeger:
-      protocols:
-        grpc: {}
-        thrift_binary: {}
-        thrift_compact: {}
-        thrift_http: {}
+  jaeger:
+    protocols:
+      grpc: {}
+      thrift_binary: {}
+      thrift_compact: {}
+      thrift_http: {}
 
-    zipkin: {}
+  zipkin: {}
 
-  processors:
-    batch: {}
-    adaptive_sampling: {}
+processors:
+  batch: {}
+  adaptive_sampling: {}
 
-  exporters:
-    jaeger_storage_exporter: {}
+exporters:
+  jaeger_storage_exporter: {}
 
 image: "jaegertracing/jaeger:latest"
-ports:
-  - name: http
-    port: 4317
-  - name: grpc
-    port: 4318
 
 provisionDataStore:
   cassandra: false

From 6dba3c90ed7ad8a21627ad43e063db4b4fc5f2dc Mon Sep 17 00:00:00 2001
From: Mehul <mehulsharma4786@gmail.com>
Date: Tue, 1 Oct 2024 17:32:04 +0000
Subject: [PATCH 03/24] fixed

Signed-off-by: Mehul <mehulsharma4786@gmail.com>
---
 charts/jaeger-v2/Chart.yaml                | 1 -
 charts/jaeger-v2/templates/config-map.yaml | 2 +-
 charts/jaeger-v2/values.yaml               | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/charts/jaeger-v2/Chart.yaml b/charts/jaeger-v2/Chart.yaml
index 7b103ab6..32112d67 100644
--- a/charts/jaeger-v2/Chart.yaml
+++ b/charts/jaeger-v2/Chart.yaml
@@ -10,7 +10,6 @@ keywords:
   - jaeger
   - opentracing
   - tracing
-  - instrumentation
 home: https://jaegertracing.io
 icon: https://www.jaegertracing.io/img/jaeger-icon-reverse-color.svg
 sources:
diff --git a/charts/jaeger-v2/templates/config-map.yaml b/charts/jaeger-v2/templates/config-map.yaml
index c3ba5821..c0a77f1b 100644
--- a/charts/jaeger-v2/templates/config-map.yaml
+++ b/charts/jaeger-v2/templates/config-map.yaml
@@ -29,7 +29,7 @@ data:
 
     processors:
       batch: {{ toYaml .Values.processors.batch | indent 6 }}
-      adaptive_sampling: {{ toYaml .Values.processors.adaptive_sampling | indent 6 }}
+      
 
     exporters:
       jaeger_storage_exporter: {{ toYaml .Values.exporters.jaeger_storage_exporter | indent 6 }}
\ No newline at end of file
diff --git a/charts/jaeger-v2/values.yaml b/charts/jaeger-v2/values.yaml
index 15b12550..6bf797d2 100644
--- a/charts/jaeger-v2/values.yaml
+++ b/charts/jaeger-v2/values.yaml
@@ -51,7 +51,6 @@ receivers:
 
 processors:
   batch: {}
-  adaptive_sampling: {}
 
 exporters:
   jaeger_storage_exporter: {}

From f858e8af8de26e80ee615e1ce786cd157c4983b8 Mon Sep 17 00:00:00 2001
From: Mehul <mehulsharma4786@gmail.com>
Date: Tue, 1 Oct 2024 17:34:26 +0000
Subject: [PATCH 04/24] lint fix

Signed-off-by: Mehul <mehulsharma4786@gmail.com>
---
 charts/jaeger-v2/values.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/charts/jaeger-v2/values.yaml b/charts/jaeger-v2/values.yaml
index 6bf797d2..11a1daa3 100644
--- a/charts/jaeger-v2/values.yaml
+++ b/charts/jaeger-v2/values.yaml
@@ -60,5 +60,4 @@ image: "jaegertracing/jaeger:latest"
 provisionDataStore:
   cassandra: false
   elasticsearch: false
-  kafka: false
-
+  kafka: false
\ No newline at end of file

From 9439e21d3bd715a8dc3ccf6b85ffb42b2664630a Mon Sep 17 00:00:00 2001
From: Mehul <mehulsharma4786@gmail.com>
Date: Tue, 1 Oct 2024 17:36:12 +0000
Subject: [PATCH 05/24] lint fix

Signed-off-by: Mehul <mehulsharma4786@gmail.com>
---
 charts/jaeger-v2/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/jaeger-v2/values.yaml b/charts/jaeger-v2/values.yaml
index 11a1daa3..f1b8f862 100644
--- a/charts/jaeger-v2/values.yaml
+++ b/charts/jaeger-v2/values.yaml
@@ -60,4 +60,4 @@ image: "jaegertracing/jaeger:latest"
 provisionDataStore:
   cassandra: false
   elasticsearch: false
-  kafka: false
\ No newline at end of file
+  kafka: false

From 82e4839addae435713fd70db7bcce39df9160ff2 Mon Sep 17 00:00:00 2001
From: Mehul <mehulsharma4786@gmail.com>
Date: Tue, 1 Oct 2024 18:13:13 +0000
Subject: [PATCH 06/24] fixed using pre-hook

Signed-off-by: Mehul <mehulsharma4786@gmail.com>
---
 charts/jaeger-v2/templates/config-map.yaml | 6 ++++--
 charts/jaeger-v2/templates/deployment.yaml | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/charts/jaeger-v2/templates/config-map.yaml b/charts/jaeger-v2/templates/config-map.yaml
index c0a77f1b..701904f0 100644
--- a/charts/jaeger-v2/templates/config-map.yaml
+++ b/charts/jaeger-v2/templates/config-map.yaml
@@ -3,6 +3,9 @@ kind: ConfigMap
 metadata:
   name: my-config
   namespace: default
+  annotations:
+    "helm.sh/hook": pre-install
+    "helm.sh/hook-delete-policy": before-hook-creation  # Optional: Deletes the hook before the next installation
 data:
   config.yaml: |
     service:
@@ -29,7 +32,6 @@ data:
 
     processors:
       batch: {{ toYaml .Values.processors.batch | indent 6 }}
-      
 
     exporters:
-      jaeger_storage_exporter: {{ toYaml .Values.exporters.jaeger_storage_exporter | indent 6 }}
\ No newline at end of file
+      jaeger_storage_exporter: {{ toYaml .Values.exporters.jaeger_storage_exporter | indent 6 }}
diff --git a/charts/jaeger-v2/templates/deployment.yaml b/charts/jaeger-v2/templates/deployment.yaml
index 0fe8cf91..82b1d153 100644
--- a/charts/jaeger-v2/templates/deployment.yaml
+++ b/charts/jaeger-v2/templates/deployment.yaml
@@ -4,6 +4,7 @@ metadata:
   name: jaeger
   labels:
     app: jaeger
+    namespace: default
 spec: 
   replicas: 1
   selector:

From e45d3b5706005869f108449df6135013b70e5da4 Mon Sep 17 00:00:00 2001
From: mehul <mehulsharam4786@gmail.com>
Date: Mon, 7 Oct 2024 20:26:12 +0530
Subject: [PATCH 07/24] fixed --config flag is not been passed

Signed-off-by: mehul <mehulsharam4786@gmail.com>
---
 charts/jaeger-v2/templates/config-map.yaml | 96 ++++++++++++++++------
 charts/jaeger-v2/templates/deployment.yaml |  8 +-
 2 files changed, 74 insertions(+), 30 deletions(-)

diff --git a/charts/jaeger-v2/templates/config-map.yaml b/charts/jaeger-v2/templates/config-map.yaml
index 701904f0..7151e838 100644
--- a/charts/jaeger-v2/templates/config-map.yaml
+++ b/charts/jaeger-v2/templates/config-map.yaml
@@ -8,30 +8,72 @@ metadata:
     "helm.sh/hook-delete-policy": before-hook-creation  # Optional: Deletes the hook before the next installation
 data:
   config.yaml: |
-    service:
-      extensions: {{ toYaml .Values.service.extensions | indent 6 }}
-      pipelines:
-        traces:
-          receivers: {{ toYaml .Values.service.pipelines.traces.receivers | indent 10 }}
-          processors: {{ toYaml .Values.service.pipelines.traces.processors | indent 10 }}
-          exporters: {{ toYaml .Values.service.pipelines.traces.exporters | indent 10 }}
-
-    extensions:
-      healthcheckv2: {{ toYaml .Values.extensions.healthcheckv2 | indent 6 }}
-
-      jaeger_query:
-        storage: {{ toYaml .Values.extensions.jaeger_query.storage | indent 8 }}
-        ui: {{ toYaml .Values.extensions.jaeger_query.ui | indent 8 }}
-      jaeger_storage: {{ toYaml .Values.extensions.jaeger_storage | indent 6 }}
-      remote_sampling: {{ toYaml .Values.extensions.remote_sampling | indent 6 }}
-
-    receivers:
-      otlp: {{ toYaml .Values.receivers.otlp | indent 6 }}
-      jaeger: {{ toYaml .Values.receivers.jaeger | indent 6 }}
-      zipkin: {{ toYaml .Values.receivers.zipkin | indent 6 }}
-
-    processors:
-      batch: {{ toYaml .Values.processors.batch | indent 6 }}
-
-    exporters:
-      jaeger_storage_exporter: {{ toYaml .Values.exporters.jaeger_storage_exporter | indent 6 }}
+        service:
+          extensions: [jaeger_storage, jaeger_query, remote_sampling, healthcheckv2]
+          pipelines:
+            traces:
+              receivers: [otlp, jaeger, zipkin]
+              processors: [batch, adaptive_sampling]
+              exporters: [jaeger_storage_exporter]
+
+        extensions:
+          healthcheckv2:
+            use_v2: true
+            http:
+
+          # pprof:
+          #   endpoint: 0.0.0.0:1777
+          # zpages:
+          #   endpoint: 0.0.0.0:55679
+
+          jaeger_query:
+            storage:
+              traces: some_store
+              traces_archive: another_store
+
+
+          jaeger_storage:
+            backends:
+              some_store:
+                memory:
+                  max_traces: 100000
+              another_store:
+                memory:
+                  max_traces: 100000
+
+          remote_sampling:
+            # You can either use file or adaptive sampling strategy in remote_sampling
+            # file:
+            #   path: ./cmd/jaeger/sampling-strategies.json
+            adaptive:
+              sampling_store: some_store
+              initial_sampling_probability: 0.1
+            http:
+            grpc:
+
+        receivers:
+          otlp:
+            protocols:
+              grpc:
+              http:
+
+          jaeger:
+            protocols:
+              grpc:
+              thrift_binary:
+              thrift_compact:
+              thrift_http:
+
+          zipkin:
+
+        processors:
+          batch:
+          # Adaptive Sampling Processor is required to support adaptive sampling.
+          # It expects remote_sampling extension with `adaptive:` config to be enabled.
+          adaptive_sampling:
+
+        exporters:
+          jaeger_storage_exporter:
+            trace_storage: some_store
+
+
diff --git a/charts/jaeger-v2/templates/deployment.yaml b/charts/jaeger-v2/templates/deployment.yaml
index 82b1d153..f981d749 100644
--- a/charts/jaeger-v2/templates/deployment.yaml
+++ b/charts/jaeger-v2/templates/deployment.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app: jaeger
     namespace: default
-spec: 
+spec:
   replicas: 1
   selector:
     matchLabels:
@@ -18,7 +18,9 @@ spec:
       containers:
         - name: jaeger
           image: jaegertracing/jaeger:latest
-
+          args: 
+            - "--config"
+            - "/etc/jaeger/config.yaml"
           ports:
             - containerPort: 16686
               name: ui
@@ -31,7 +33,7 @@ spec:
           env:
             - name: COLLECTOR_ZIPKIN_HOST_PORT
               value: ":9411"
-          resources:   # Corrected the typo here
+          resources:
             limits:
               cpu: 500m
               memory: 512Mi

From 84e7a072e78d0d4a44001d6477802df49b0fc827 Mon Sep 17 00:00:00 2001
From: mehul <mehulsharam4786@gmail.com>
Date: Wed, 9 Oct 2024 23:35:46 +0530
Subject: [PATCH 08/24] release ns for config-map.yaml

Signed-off-by: mehul <mehulsharam4786@gmail.com>
---
 charts/jaeger-v2/templates/config-map.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/jaeger-v2/templates/config-map.yaml b/charts/jaeger-v2/templates/config-map.yaml
index 7151e838..1642897b 100644
--- a/charts/jaeger-v2/templates/config-map.yaml
+++ b/charts/jaeger-v2/templates/config-map.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: my-config
-  namespace: default
+  namespace: {{ .Release.Namespace }}
   annotations:
     "helm.sh/hook": pre-install
     "helm.sh/hook-delete-policy": before-hook-creation  # Optional: Deletes the hook before the next installation

From 38d3708805a45a32dea7df06dfa375b2c27cacf7 Mon Sep 17 00:00:00 2001
From: mehul <mehulsharam4786@gmail.com>
Date: Wed, 9 Oct 2024 23:55:09 +0530
Subject: [PATCH 09/24] testing ci

Signed-off-by: mehul <mehulsharam4786@gmail.com>
---
 .github/workflows/lint-test.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
index 5b00b5be..9b461db3 100644
--- a/.github/workflows/lint-test.yaml
+++ b/.github/workflows/lint-test.yaml
@@ -67,6 +67,10 @@ jobs:
       - name: Check if cert-manager is up
         run: |
           cmctl check api --wait=5m
+      - name: Create ns and install 
+        run: |
+          kubectl --request-timeout=30s create namespace jaeger-v2-y
+          helm install  jaeger-v2-y charts/jaeger-v2 --namespace jaeger-v2-y --wait --timeout=600s
 
       - name: Run chart-testing (install)
         run: ct install --config ct.yaml

From 6bc9dcc40afc1825fc2e26e7c9efd29f33d8c15d Mon Sep 17 00:00:00 2001
From: mehul <mehulsharam4786@gmail.com>
Date: Thu, 10 Oct 2024 00:00:11 +0530
Subject: [PATCH 10/24] testing ci

Signed-off-by: mehul <mehulsharam4786@gmail.com>
---
 .github/workflows/lint-test.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
index 9b461db3..f71e0125 100644
--- a/.github/workflows/lint-test.yaml
+++ b/.github/workflows/lint-test.yaml
@@ -74,3 +74,6 @@ jobs:
 
       - name: Run chart-testing (install)
         run: ct install --config ct.yaml
+
+      - name: configmap
+        run: kubectl get configmap -A

From be93c146d0fd0ae256258d1f3ab2e4e1e8087ce4 Mon Sep 17 00:00:00 2001
From: mehul <mehulsharam4786@gmail.com>
Date: Fri, 11 Oct 2024 01:24:59 +0530
Subject: [PATCH 11/24] fixed ns

Signed-off-by: mehul <mehulsharam4786@gmail.com>
---
 .github/workflows/lint-test.yaml           | 4 ----
 charts/jaeger-v2/templates/deployment.yaml | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
index f71e0125..170f1957 100644
--- a/.github/workflows/lint-test.yaml
+++ b/.github/workflows/lint-test.yaml
@@ -67,10 +67,6 @@ jobs:
       - name: Check if cert-manager is up
         run: |
           cmctl check api --wait=5m
-      - name: Create ns and install 
-        run: |
-          kubectl --request-timeout=30s create namespace jaeger-v2-y
-          helm install  jaeger-v2-y charts/jaeger-v2 --namespace jaeger-v2-y --wait --timeout=600s
 
       - name: Run chart-testing (install)
         run: ct install --config ct.yaml
diff --git a/charts/jaeger-v2/templates/deployment.yaml b/charts/jaeger-v2/templates/deployment.yaml
index f981d749..c641becc 100644
--- a/charts/jaeger-v2/templates/deployment.yaml
+++ b/charts/jaeger-v2/templates/deployment.yaml
@@ -4,7 +4,7 @@ metadata:
   name: jaeger
   labels:
     app: jaeger
-    namespace: default
+    namespace: {{ .Release.Namespace }}
 spec:
   replicas: 1
   selector:

From aac8af9a0ccb21cfaaeaadef59320f3d28e37f7d Mon Sep 17 00:00:00 2001
From: mehul <mehulsharam4786@gmail.com>
Date: Fri, 11 Oct 2024 01:30:58 +0530
Subject: [PATCH 12/24] fixed ns

Signed-off-by: mehul <mehulsharam4786@gmail.com>
---
 .github/workflows/lint-test.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
index 170f1957..41ff6ae3 100644
--- a/.github/workflows/lint-test.yaml
+++ b/.github/workflows/lint-test.yaml
@@ -71,5 +71,3 @@ jobs:
       - name: Run chart-testing (install)
         run: ct install --config ct.yaml
 
-      - name: configmap
-        run: kubectl get configmap -A

From 2bccbc81722b3b44c72f68b6fa097bb3ee6efeff Mon Sep 17 00:00:00 2001
From: mehul <mehulsharam4786@gmail.com>
Date: Fri, 11 Oct 2024 13:35:40 +0530
Subject: [PATCH 13/24] fixed template

Signed-off-by: mehul <mehulsharam4786@gmail.com>
---
 charts/jaeger-v2/templates/config-map.yaml | 65 +++-------------------
 charts/jaeger-v2/values.yaml               | 40 ++++++++-----
 2 files changed, 34 insertions(+), 71 deletions(-)

diff --git a/charts/jaeger-v2/templates/config-map.yaml b/charts/jaeger-v2/templates/config-map.yaml
index 1642897b..ce4ad4dc 100644
--- a/charts/jaeger-v2/templates/config-map.yaml
+++ b/charts/jaeger-v2/templates/config-map.yaml
@@ -5,75 +5,26 @@ metadata:
   namespace: {{ .Release.Namespace }}
   annotations:
     "helm.sh/hook": pre-install
-    "helm.sh/hook-delete-policy": before-hook-creation  # Optional: Deletes the hook before the next installation
 data:
   config.yaml: |
         service:
-          extensions: [jaeger_storage, jaeger_query, remote_sampling, healthcheckv2]
+          extensions:  [{{ join ", " .Values.service.extensions }}]
           pipelines:
             traces:
-              receivers: [otlp, jaeger, zipkin]
-              processors: [batch, adaptive_sampling]
-              exporters: [jaeger_storage_exporter]
+              receivers: [{{ join ", " .Values.service.pipelines.traces.receivers }}]
+              processors: [{{ join ", " .Values.service.pipelines.traces.processors }}]
+              exporters: [{{ join ", " .Values.service.pipelines.traces.exporters }}]
 
         extensions:
-          healthcheckv2:
-            use_v2: true
-            http:
-
-          # pprof:
-          #   endpoint: 0.0.0.0:1777
-          # zpages:
-          #   endpoint: 0.0.0.0:55679
-
-          jaeger_query:
-            storage:
-              traces: some_store
-              traces_archive: another_store
-
-
-          jaeger_storage:
-            backends:
-              some_store:
-                memory:
-                  max_traces: 100000
-              another_store:
-                memory:
-                  max_traces: 100000
-
-          remote_sampling:
-            # You can either use file or adaptive sampling strategy in remote_sampling
-            # file:
-            #   path: ./cmd/jaeger/sampling-strategies.json
-            adaptive:
-              sampling_store: some_store
-              initial_sampling_probability: 0.1
-            http:
-            grpc:
+{{ toYaml .Values.extensions | indent 10 }}
 
         receivers:
-          otlp:
-            protocols:
-              grpc:
-              http:
-
-          jaeger:
-            protocols:
-              grpc:
-              thrift_binary:
-              thrift_compact:
-              thrift_http:
-
-          zipkin:
+{{ toYaml .Values.receivers | indent 10 }}
 
         processors:
-          batch:
-          # Adaptive Sampling Processor is required to support adaptive sampling.
-          # It expects remote_sampling extension with `adaptive:` config to be enabled.
-          adaptive_sampling:
+{{ toYaml .Values.processors | indent 10 }}
 
         exporters:
-          jaeger_storage_exporter:
-            trace_storage: some_store
+{{ toYaml .Values.exporters | indent 10 }}
 
 
diff --git a/charts/jaeger-v2/values.yaml b/charts/jaeger-v2/values.yaml
index f1b8f862..199788b0 100644
--- a/charts/jaeger-v2/values.yaml
+++ b/charts/jaeger-v2/values.yaml
@@ -9,14 +9,18 @@ service:
 extensions:
   healthcheckv2:
     use_v2: true
-    http: {}
+    http:
+
+  # pprof:
+  #   endpoint: 0.0.0.0:1777
+  # zpages:
+  #   endpoint: 0.0.0.0:55679
 
   jaeger_query:
     storage:
       traces: some_store
       traces_archive: another_store
-    ui:
-      config_file: ./cmd/jaeger/config-ui.json
+
 
   jaeger_storage:
     backends:
@@ -28,32 +32,40 @@ extensions:
           max_traces: 100000
 
   remote_sampling:
+    # You can either use file or adaptive sampling strategy in remote_sampling
+    # file:
+    #   path: ./cmd/jaeger/sampling-strategies.json
     adaptive:
       sampling_store: some_store
       initial_sampling_probability: 0.1
-    http: {}
-    grpc: {}
+    http:
+    grpc:
 
 receivers:
   otlp:
     protocols:
-      grpc: {}
-      http: {}
+      grpc:
+      http:
 
   jaeger:
     protocols:
-      grpc: {}
-      thrift_binary: {}
-      thrift_compact: {}
-      thrift_http: {}
+      grpc:
+      thrift_binary:
+      thrift_compact:
+      thrift_http:
 
-  zipkin: {}
+  zipkin:
 
 processors:
-  batch: {}
+  batch:
+  # Adaptive Sampling Processor is required to support adaptive sampling.
+  # It expects remote_sampling extension with `adaptive:` config to be enabled.
+  adaptive_sampling:
 
 exporters:
-  jaeger_storage_exporter: {}
+  jaeger_storage_exporter:
+    trace_storage: some_store
+
 
 image: "jaegertracing/jaeger:latest"
 

From 0cec95bfb4e11deac1319654644241c3f27fd515 Mon Sep 17 00:00:00 2001
From: mehul <mehulsharam4786@gmail.com>
Date: Fri, 11 Oct 2024 22:42:15 +0530
Subject: [PATCH 14/24] removed sampling

Signed-off-by: mehul <mehulsharam4786@gmail.com>
---
 .github/workflows/lint-test.yaml |  1 -
 charts/jaeger-v2/values.yaml     | 12 ++----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
index 41ff6ae3..5b00b5be 100644
--- a/.github/workflows/lint-test.yaml
+++ b/.github/workflows/lint-test.yaml
@@ -70,4 +70,3 @@ jobs:
 
       - name: Run chart-testing (install)
         run: ct install --config ct.yaml
-
diff --git a/charts/jaeger-v2/values.yaml b/charts/jaeger-v2/values.yaml
index 199788b0..02051c1a 100644
--- a/charts/jaeger-v2/values.yaml
+++ b/charts/jaeger-v2/values.yaml
@@ -1,5 +1,5 @@
 service:
-  extensions: [jaeger_storage, jaeger_query, remote_sampling, healthcheckv2]
+  extensions: [jaeger_storage, jaeger_query, healthcheckv2]
   pipelines:
     traces:
       receivers: [otlp, jaeger, zipkin]
@@ -31,15 +31,7 @@ extensions:
         memory:
           max_traces: 100000
 
-  remote_sampling:
-    # You can either use file or adaptive sampling strategy in remote_sampling
-    # file:
-    #   path: ./cmd/jaeger/sampling-strategies.json
-    adaptive:
-      sampling_store: some_store
-      initial_sampling_probability: 0.1
-    http:
-    grpc:
+
 
 receivers:
   otlp:

From 144e55f657555387f2f8239f26fb0e772d3d03fa Mon Sep 17 00:00:00 2001
From: mehul <mehulsharam4786@gmail.com>
Date: Sat, 12 Oct 2024 00:04:50 +0530
Subject: [PATCH 15/24] removed adaptive sampling from processors

Signed-off-by: mehul <mehulsharam4786@gmail.com>
---
 charts/jaeger-v2/Chart.yaml  | 2 +-
 charts/jaeger-v2/values.yaml | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/charts/jaeger-v2/Chart.yaml b/charts/jaeger-v2/Chart.yaml
index 32112d67..7f5afb50 100644
--- a/charts/jaeger-v2/Chart.yaml
+++ b/charts/jaeger-v2/Chart.yaml
@@ -8,7 +8,7 @@ version: 3.3.1
 kubeVersion: ">= 1.21-0"
 keywords:
   - jaeger
-  - opentracing
+  - opentelemetry
   - tracing
 home: https://jaegertracing.io
 icon: https://www.jaegertracing.io/img/jaeger-icon-reverse-color.svg
diff --git a/charts/jaeger-v2/values.yaml b/charts/jaeger-v2/values.yaml
index 02051c1a..23db61e5 100644
--- a/charts/jaeger-v2/values.yaml
+++ b/charts/jaeger-v2/values.yaml
@@ -3,7 +3,7 @@ service:
   pipelines:
     traces:
       receivers: [otlp, jaeger, zipkin]
-      processors: [batch, adaptive_sampling]
+      processors: [batch]
       exporters: [jaeger_storage_exporter]
 
 extensions:
@@ -50,9 +50,6 @@ receivers:
 
 processors:
   batch:
-  # Adaptive Sampling Processor is required to support adaptive sampling.
-  # It expects remote_sampling extension with `adaptive:` config to be enabled.
-  adaptive_sampling:
 
 exporters:
   jaeger_storage_exporter:

From 12e508f3caf0b4c26e06dc4e8428ee31c0f8114b Mon Sep 17 00:00:00 2001
From: mehul <mehulsharam4786@gmail.com>
Date: Sat, 12 Oct 2024 00:21:43 +0530
Subject: [PATCH 16/24] fixed lint

Signed-off-by: mehul <mehulsharam4786@gmail.com>
---
 charts/jaeger-v2/values.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/charts/jaeger-v2/values.yaml b/charts/jaeger-v2/values.yaml
index 23db61e5..5b47c422 100644
--- a/charts/jaeger-v2/values.yaml
+++ b/charts/jaeger-v2/values.yaml
@@ -31,8 +31,6 @@ extensions:
         memory:
           max_traces: 100000
 
-
-
 receivers:
   otlp:
     protocols:

From 6985100454cf61966c52126ffbbef837bed226ca Mon Sep 17 00:00:00 2001
From: mehul <mehulsharam4786@gmail.com>
Date: Sat, 12 Oct 2024 02:29:44 +0530
Subject: [PATCH 17/24] fixed some template

Signed-off-by: mehul <mehulsharam4786@gmail.com>
---
 charts/jaeger-v2/Chart.yaml                |  2 +-
 charts/jaeger-v2/templates/_helpers.tpl    |  9 +++++++++
 charts/jaeger-v2/templates/config-map.yaml |  8 ++++----
 charts/jaeger-v2/templates/deployment.yaml | 18 ++++++++----------
 charts/jaeger-v2/values.yaml               |  5 +++++
 5 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/charts/jaeger-v2/Chart.yaml b/charts/jaeger-v2/Chart.yaml
index 7f5afb50..73b66cb3 100644
--- a/charts/jaeger-v2/Chart.yaml
+++ b/charts/jaeger-v2/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 appVersion: 1.53.0
 description: A Jaeger Helm chart for Kubernetes
-name: jaeger
+name: jaeger-v2
 type: application
 version: 3.3.1
 # CronJobs require v1.21
diff --git a/charts/jaeger-v2/templates/_helpers.tpl b/charts/jaeger-v2/templates/_helpers.tpl
index 84836006..0b2cbde2 100644
--- a/charts/jaeger-v2/templates/_helpers.tpl
+++ b/charts/jaeger-v2/templates/_helpers.tpl
@@ -60,3 +60,12 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+{{- define "jaeger-v2.namespace" -}}
+  {{- if .Values.namespaceOverride -}}
+    {{- .Values.namespaceOverride -}}
+  {{- else -}}
+    {{- .Release.Namespace -}}
+  {{- end -}}
+{{- end -}}
+
diff --git a/charts/jaeger-v2/templates/config-map.yaml b/charts/jaeger-v2/templates/config-map.yaml
index ce4ad4dc..a79666df 100644
--- a/charts/jaeger-v2/templates/config-map.yaml
+++ b/charts/jaeger-v2/templates/config-map.yaml
@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: my-config
-  namespace: {{ .Release.Namespace }}
-  annotations:
-    "helm.sh/hook": pre-install
+  name: {{ include "jaeger-v2.fullname" . }}
+  namespace: {{ template "jaeger-v2.namespace" . }}
+  labels:
+        {{- include "jaeger-v2.labels" . | nindent 4 }}
 data:
   config.yaml: |
         service:
diff --git a/charts/jaeger-v2/templates/deployment.yaml b/charts/jaeger-v2/templates/deployment.yaml
index c641becc..66e7299e 100644
--- a/charts/jaeger-v2/templates/deployment.yaml
+++ b/charts/jaeger-v2/templates/deployment.yaml
@@ -1,10 +1,10 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: jaeger
+  name: {{ include "jaeger-v2.fullname" . }}
+  namespace: {{ template "jaeger-v2.namespace" . }}
   labels:
-    app: jaeger
-    namespace: {{ .Release.Namespace }}
+    {{- include "jaeger-v2.labels" . | nindent 4 }}
 spec:
   replicas: 1
   selector:
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: jaeger
-          image: jaegertracing/jaeger:latest
+          image: jaegertracing/jaeger:2.0.0-rc2
           args: 
             - "--config"
             - "/etc/jaeger/config.yaml"
@@ -30,9 +30,7 @@ spec:
               name: grpc
             - containerPort: 9411
               name: zipkin
-          env:
-            - name: COLLECTOR_ZIPKIN_HOST_PORT
-              value: ":9411"
+
           resources:
             limits:
               cpu: 500m
@@ -41,9 +39,9 @@ spec:
               cpu: 100m
               memory: 256Mi
           volumeMounts:
-            - name: config-volume
+            - name: jaeger-v2-config
               mountPath: /etc/jaeger
       volumes:
-        - name: config-volume
+        - name: jaeger-v2-config
           configMap:
-            name: my-config
\ No newline at end of file
+            name: {{ include "jaeger-v2.fullname" . }}
\ No newline at end of file
diff --git a/charts/jaeger-v2/values.yaml b/charts/jaeger-v2/values.yaml
index 5b47c422..2d65dff2 100644
--- a/charts/jaeger-v2/values.yaml
+++ b/charts/jaeger-v2/values.yaml
@@ -1,3 +1,8 @@
+nameOverride: ""
+fullnameOverride: ""
+# Specify which namespace should be used to deploy the resources into
+namespaceOverride: ""
+
 service:
   extensions: [jaeger_storage, jaeger_query, healthcheckv2]
   pipelines:

From 0fae1f750ccb7c81fead982deb32bf4693dc48e4 Mon Sep 17 00:00:00 2001
From: mehul <mehulsharam4786@gmail.com>
Date: Sat, 12 Oct 2024 12:06:08 +0530
Subject: [PATCH 18/24] fixed syntax problem in charts/jaeger-v2/config-map

Signed-off-by: mehul <mehulsharam4786@gmail.com>
---
 charts/jaeger-v2/templates/_helpers.tpl    | 15 +++++++++++++++
 charts/jaeger-v2/templates/config-map.yaml | 13 ++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/charts/jaeger-v2/templates/_helpers.tpl b/charts/jaeger-v2/templates/_helpers.tpl
index 0b2cbde2..faf6b8aa 100644
--- a/charts/jaeger-v2/templates/_helpers.tpl
+++ b/charts/jaeger-v2/templates/_helpers.tpl
@@ -69,3 +69,18 @@ Create the name of the service account to use
   {{- end -}}
 {{- end -}}
 
+{{- define "jaeger.extensionsConfig" -}}
+{{ toYaml .Values.extensions | nindent 6 }}
+{{- end }}
+
+{{- define "jaeger.receiversConfig" -}}
+{{ toYaml .Values.receivers | nindent 6 }}
+{{- end }}
+
+{{- define "jaeger.processorsConfig" -}}
+{{ toYaml .Values.processors | nindent 6 }}
+{{- end }}
+
+{{- define "jaeger.exportersConfig" -}}
+{{ toYaml .Values.exporters | nindent 6 }}
+{{- end }}
diff --git a/charts/jaeger-v2/templates/config-map.yaml b/charts/jaeger-v2/templates/config-map.yaml
index a79666df..4da6710a 100644
--- a/charts/jaeger-v2/templates/config-map.yaml
+++ b/charts/jaeger-v2/templates/config-map.yaml
@@ -16,15 +16,10 @@ data:
               exporters: [{{ join ", " .Values.service.pipelines.traces.exporters }}]
 
         extensions:
-{{ toYaml .Values.extensions | indent 10 }}
-
+          {{- include "jaeger.extensionsConfig" . | nindent 6 }}
         receivers:
-{{ toYaml .Values.receivers | indent 10 }}
-
+          {{- include "jaeger.receiversConfig" . | nindent 6 }}
         processors:
-{{ toYaml .Values.processors | indent 10 }}
-
+          {{- include "jaeger.processorsConfig" . | nindent 6 }}
         exporters:
-{{ toYaml .Values.exporters | indent 10 }}
-
-
+          {{- include "jaeger.exportersConfig" . | nindent 6 }}

From c0fd53072a8e47f5cec5dde70ebb0c6fe16536df Mon Sep 17 00:00:00 2001
From: mehul <mehulsharam4786@gmail.com>
Date: Sat, 12 Oct 2024 13:43:54 +0530
Subject: [PATCH 19/24] added labels

Signed-off-by: mehul <mehulsharam4786@gmail.com>
---
 charts/jaeger-v2/templates/_helpers.tpl    | 14 ++++++++----
 charts/jaeger-v2/templates/config-map.yaml |  8 +++----
 charts/jaeger-v2/templates/deployment.yaml | 13 ++++++-----
 charts/jaeger-v2/values.yaml               | 25 +++++++++++++++++-----
 4 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/charts/jaeger-v2/templates/_helpers.tpl b/charts/jaeger-v2/templates/_helpers.tpl
index faf6b8aa..3a01a3f9 100644
--- a/charts/jaeger-v2/templates/_helpers.tpl
+++ b/charts/jaeger-v2/templates/_helpers.tpl
@@ -69,18 +69,24 @@ Create the name of the service account to use
   {{- end -}}
 {{- end -}}
 
-{{- define "jaeger.extensionsConfig" -}}
+{{- define "jaeger-v2.extensionsConfig" -}}
 {{ toYaml .Values.extensions | nindent 6 }}
 {{- end }}
 
-{{- define "jaeger.receiversConfig" -}}
+{{- define "jaeger-v2.receiversConfig" -}}
 {{ toYaml .Values.receivers | nindent 6 }}
 {{- end }}
 
-{{- define "jaeger.processorsConfig" -}}
+{{- define "jaeger-v2.processorsConfig" -}}
 {{ toYaml .Values.processors | nindent 6 }}
 {{- end }}
 
-{{- define "jaeger.exportersConfig" -}}
+{{- define "jaeger-v2.exportersConfig" -}}
 {{ toYaml .Values.exporters | nindent 6 }}
 {{- end }}
+
+{{- define "jaeger-v2.podLabels" -}}
+{{- if .Values.podLabels }}
+{{- tpl (.Values.podLabels | toYaml) . }}
+{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/jaeger-v2/templates/config-map.yaml b/charts/jaeger-v2/templates/config-map.yaml
index 4da6710a..a267676d 100644
--- a/charts/jaeger-v2/templates/config-map.yaml
+++ b/charts/jaeger-v2/templates/config-map.yaml
@@ -16,10 +16,10 @@ data:
               exporters: [{{ join ", " .Values.service.pipelines.traces.exporters }}]
 
         extensions:
-          {{- include "jaeger.extensionsConfig" . | nindent 6 }}
+          {{- include "jaeger-v2.extensionsConfig" . | nindent 6 }}
         receivers:
-          {{- include "jaeger.receiversConfig" . | nindent 6 }}
+          {{- include "jaeger-v2.receiversConfig" . | nindent 6 }}
         processors:
-          {{- include "jaeger.processorsConfig" . | nindent 6 }}
+          {{- include "jaeger-v2.processorsConfig" . | nindent 6 }}
         exporters:
-          {{- include "jaeger.exportersConfig" . | nindent 6 }}
+          {{- include "jaeger-v2.exportersConfig" . | nindent 6 }}
diff --git a/charts/jaeger-v2/templates/deployment.yaml b/charts/jaeger-v2/templates/deployment.yaml
index 66e7299e..a8bc6acd 100644
--- a/charts/jaeger-v2/templates/deployment.yaml
+++ b/charts/jaeger-v2/templates/deployment.yaml
@@ -6,18 +6,21 @@ metadata:
   labels:
     {{- include "jaeger-v2.labels" . | nindent 4 }}
 spec:
-  replicas: 1
+  {{- if not .Values.autoscaling.enabled }}
+  replicas: {{ .Values.replicaCount }}
+  {{- end }}
   selector:
     matchLabels:
-      app: jaeger
+      {{- include "jaeger-v2.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
-        app: jaeger
+        {{- include "jaeger-v2.selectorLabels" . | nindent 8 }}
+        {{- include "jaeger-v2.podLabels" . | nindent 8}}
     spec:
       containers:
-        - name: jaeger
-          image: jaegertracing/jaeger:2.0.0-rc2
+        - name: jaeger-v2
+          image: {{ .Values.image }}
           args: 
             - "--config"
             - "/etc/jaeger/config.yaml"
diff --git a/charts/jaeger-v2/values.yaml b/charts/jaeger-v2/values.yaml
index 2d65dff2..b1ed8e99 100644
--- a/charts/jaeger-v2/values.yaml
+++ b/charts/jaeger-v2/values.yaml
@@ -3,6 +3,11 @@ fullnameOverride: ""
 # Specify which namespace should be used to deploy the resources into
 namespaceOverride: ""
 
+provisionDataStore:
+  cassandra: false
+  elasticsearch: false
+  kafka: false
+
 service:
   extensions: [jaeger_storage, jaeger_query, healthcheckv2]
   pipelines:
@@ -59,9 +64,19 @@ exporters:
     trace_storage: some_store
 
 
-image: "jaegertracing/jaeger:latest"
 
-provisionDataStore:
-  cassandra: false
-  elasticsearch: false
-  kafka: false
+image: "jaegertracing/jaeger:2.0.0-rc2"
+
+
+# autoscaling is used only if mode is "deployment" or "statefulset"
+autoscaling:
+  enabled: false
+  minReplicas: 1
+  maxReplicas: 10
+  behavior: {}
+  targetCPUUtilizationPercentage: 80
+
+# only used with deployment mode
+replicaCount: 1
+#labels for pods 
+podLabels: {}
\ No newline at end of file

From c4ac26b65d3eb81c18e5eceea57de1a28be99446 Mon Sep 17 00:00:00 2001
From: mehul <mehulsharam4786@gmail.com>
Date: Sat, 12 Oct 2024 13:57:12 +0530
Subject: [PATCH 20/24] fixed lint

Signed-off-by: mehul <mehulsharam4786@gmail.com>
---
 charts/jaeger-v2/values.yaml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/charts/jaeger-v2/values.yaml b/charts/jaeger-v2/values.yaml
index b1ed8e99..d26fd9a5 100644
--- a/charts/jaeger-v2/values.yaml
+++ b/charts/jaeger-v2/values.yaml
@@ -63,11 +63,8 @@ exporters:
   jaeger_storage_exporter:
     trace_storage: some_store
 
-
-
 image: "jaegertracing/jaeger:2.0.0-rc2"
 
-
 # autoscaling is used only if mode is "deployment" or "statefulset"
 autoscaling:
   enabled: false
@@ -78,5 +75,5 @@ autoscaling:
 
 # only used with deployment mode
 replicaCount: 1
-#labels for pods 
-podLabels: {}
\ No newline at end of file
+# labels for pods
+podLabels: {}

From 54a324885c20a1432b26a4b64f51cf3b567d12e4 Mon Sep 17 00:00:00 2001
From: mehul <mehulsharam4786@gmail.com>
Date: Sun, 13 Oct 2024 23:54:01 +0530
Subject: [PATCH 21/24] fixed

Signed-off-by: mehul <mehulsharam4786@gmail.com>
---
 charts/jaeger-v2/values.yaml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/charts/jaeger-v2/values.yaml b/charts/jaeger-v2/values.yaml
index d26fd9a5..a54b9cb1 100644
--- a/charts/jaeger-v2/values.yaml
+++ b/charts/jaeger-v2/values.yaml
@@ -28,13 +28,13 @@ extensions:
 
   jaeger_query:
     storage:
-      traces: some_store
+      traces: primary_store
       traces_archive: another_store
 
 
   jaeger_storage:
     backends:
-      some_store:
+      primary_store:
         memory:
           max_traces: 100000
       another_store:
@@ -50,9 +50,7 @@ receivers:
   jaeger:
     protocols:
       grpc:
-      thrift_binary:
-      thrift_compact:
-      thrift_http:
+
 
   zipkin:
 
@@ -61,7 +59,7 @@ processors:
 
 exporters:
   jaeger_storage_exporter:
-    trace_storage: some_store
+    trace_storage: primary_store
 
 image: "jaegertracing/jaeger:2.0.0-rc2"
 

From 03973fb54756e959f9944e6f1e10aa66c0627e94 Mon Sep 17 00:00:00 2001
From: mehul <mehulsharam4786@gmail.com>
Date: Wed, 16 Oct 2024 03:10:30 +0530
Subject: [PATCH 22/24] fixed

Signed-off-by: mehul <mehulsharam4786@gmail.com>
---
 charts/jaeger-v2/Chart.yaml                |  8 ++++----
 charts/jaeger-v2/readme.md                 | 16 ++++++++--------
 charts/jaeger-v2/templates/config-map.yaml |  2 +-
 charts/jaeger-v2/templates/deployment.yaml | 14 +++++++++-----
 charts/jaeger-v2/values.yaml               | 20 ++++++++++++++++----
 5 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/charts/jaeger-v2/Chart.yaml b/charts/jaeger-v2/Chart.yaml
index 73b66cb3..11d45257 100644
--- a/charts/jaeger-v2/Chart.yaml
+++ b/charts/jaeger-v2/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 1.53.0
+appVersion: 2.0.0-rc2
 description: A Jaeger Helm chart for Kubernetes
 name: jaeger-v2
 type: application
-version: 3.3.1
+version: 1.0.0
 # CronJobs require v1.21
 kubeVersion: ">= 1.21-0"
 keywords:
@@ -29,8 +29,8 @@ maintainers:
     email: jkowall@kowall.net
 dependencies:
   - name: cassandra
-    version: 0.15.3
-    repository: https://charts.helm.sh/incubator
+    version: 12.0.3
+    repository: https://charts.bitnami.com/bitnami
     condition: provisionDataStore.cassandra
   - name: elasticsearch
     version: 20.0.4
diff --git a/charts/jaeger-v2/readme.md b/charts/jaeger-v2/readme.md
index 4d2954cb..4e87fbf9 100644
--- a/charts/jaeger-v2/readme.md
+++ b/charts/jaeger-v2/readme.md
@@ -14,10 +14,10 @@ kali@PC:~/LFX/helm-charts/charts/jaeger-v2$ tree
 ├── Chart.lock
 ├── Chart.yaml
 ├── charts
-│   ├── cassandra-0.15.3.tgz
-│   ├── common-2.23.0.tgz
-│   ├── elasticsearch-20.0.4.tgz
-│   └── kafka-26.6.2.tgz
+│   ├── cassandra.tgz
+│   ├── common.tgz
+│   ├── elasticsearch.tgz
+│   └── kafka.tgz
 ├── readme.md
 ├── templates
 │   ├── _helpers.tpl
@@ -144,10 +144,10 @@ When deploying Jaeger using a custom values file, any configuration set in the f
 ## Dependencies
 
 This Helm chart comes with pre-packaged dependencies for data stores:
-- **Cassandra**: Version `0.15.3`
-- **Elasticsearch**: Version `20.0.4`
-- **Kafka**: Version `26.6.2`
-- **Common**: Version `2.23.0`
+- **Cassandra**: Version
+- **Elasticsearch**: Version
+- **Kafka**: Version
+- **Common**: Version
 
 These dependencies can be managed through the `charts/` directory, and they are installed as part of the Jaeger deployment.
 
diff --git a/charts/jaeger-v2/templates/config-map.yaml b/charts/jaeger-v2/templates/config-map.yaml
index a267676d..00a1c089 100644
--- a/charts/jaeger-v2/templates/config-map.yaml
+++ b/charts/jaeger-v2/templates/config-map.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "jaeger-v2.fullname" . }}
-  namespace: {{ template "jaeger-v2.namespace" . }}
+  namespace: {{ include "jaeger-v2.namespace" . }}
   labels:
         {{- include "jaeger-v2.labels" . | nindent 4 }}
 data:
diff --git a/charts/jaeger-v2/templates/deployment.yaml b/charts/jaeger-v2/templates/deployment.yaml
index a8bc6acd..7e0fda21 100644
--- a/charts/jaeger-v2/templates/deployment.yaml
+++ b/charts/jaeger-v2/templates/deployment.yaml
@@ -20,7 +20,7 @@ spec:
     spec:
       containers:
         - name: jaeger-v2
-          image: {{ .Values.image }}
+          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}/{{ .Values.image.name }}:{{ .Values.image.tag }}"
           args: 
             - "--config"
             - "/etc/jaeger/config.yaml"
@@ -33,14 +33,18 @@ spec:
               name: grpc
             - containerPort: 9411
               name: zipkin
+            - containerPort: 4317
+              name: otlp-grpc
+            - containerPort: 4318
+              name: otlp-http
 
           resources:
             limits:
-              cpu: 500m
-              memory: 512Mi
+              cpu: {{ .Values.resources.limits.cpu }}
+              memory: {{ .Values.resources.limits.memory }}
             requests:
-              cpu: 100m
-              memory: 256Mi
+              cpu: {{ .Values.resources.requests.cpu }}
+              memory: {{ .Values.resources.requests.memory }}
           volumeMounts:
             - name: jaeger-v2-config
               mountPath: /etc/jaeger
diff --git a/charts/jaeger-v2/values.yaml b/charts/jaeger-v2/values.yaml
index a54b9cb1..360621d3 100644
--- a/charts/jaeger-v2/values.yaml
+++ b/charts/jaeger-v2/values.yaml
@@ -29,7 +29,7 @@ extensions:
   jaeger_query:
     storage:
       traces: primary_store
-      traces_archive: another_store
+      traces_archive: archive_store
 
 
   jaeger_storage:
@@ -37,7 +37,7 @@ extensions:
       primary_store:
         memory:
           max_traces: 100000
-      another_store:
+      archive_store:
         memory:
           max_traces: 100000
 
@@ -51,7 +51,6 @@ receivers:
     protocols:
       grpc:
 
-
   zipkin:
 
 processors:
@@ -61,7 +60,12 @@ exporters:
   jaeger_storage_exporter:
     trace_storage: primary_store
 
-image: "jaegertracing/jaeger:2.0.0-rc2"
+image:
+  registry: "docker.io"
+  repository: "jaegertracing"
+  name: "jaeger"
+  tag: "2.0.0-rc2"
+
 
 # autoscaling is used only if mode is "deployment" or "statefulset"
 autoscaling:
@@ -75,3 +79,11 @@ autoscaling:
 replicaCount: 1
 # labels for pods
 podLabels: {}
+
+resources:
+  limits:
+    cpu: 500m
+    memory: 512Mi
+  requests:
+    cpu: 100m
+    memory: 256Mi
\ No newline at end of file

From e2425ebd4283c41e675ab7144da8ca7ace0ce87f Mon Sep 17 00:00:00 2001
From: mehul <mehulsharam4786@gmail.com>
Date: Wed, 16 Oct 2024 03:23:09 +0530
Subject: [PATCH 23/24] regenerated chart.lock

Signed-off-by: mehul <mehulsharam4786@gmail.com>
---
 charts/jaeger-v2/Chart.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/charts/jaeger-v2/Chart.lock b/charts/jaeger-v2/Chart.lock
index 89e13342..5ae11afd 100644
--- a/charts/jaeger-v2/Chart.lock
+++ b/charts/jaeger-v2/Chart.lock
@@ -1,7 +1,7 @@
 dependencies:
 - name: cassandra
-  repository: https://charts.helm.sh/incubator
-  version: 0.15.3
+  repository: https://charts.bitnami.com/bitnami
+  version: 12.0.3
 - name: elasticsearch
   repository: https://charts.bitnami.com/bitnami
   version: 20.0.4
@@ -10,6 +10,6 @@ dependencies:
   version: 26.6.2
 - name: common
   repository: https://charts.bitnami.com/bitnami
-  version: 2.23.0
-digest: sha256:b13c6270d6d45478b47d03157f7a1c44add98be0809d83b22597a0c800781c10
-generated: "2024-10-01T10:23:03.372102011Z"
+  version: 2.26.0
+digest: sha256:93632d48e0cac6077b5c8250ab0675d5067c6b6865c692a16ebbc03a9e089287
+generated: "2024-10-16T03:22:08.747721865+05:30"

From 2960a50577b452bec2a1c74996186ae12a471cd6 Mon Sep 17 00:00:00 2001
From: mehul <mehulsharam4786@gmail.com>
Date: Wed, 16 Oct 2024 03:24:35 +0530
Subject: [PATCH 24/24] fix lint

Signed-off-by: mehul <mehulsharam4786@gmail.com>
---
 charts/jaeger-v2/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/jaeger-v2/values.yaml b/charts/jaeger-v2/values.yaml
index 360621d3..294622d1 100644
--- a/charts/jaeger-v2/values.yaml
+++ b/charts/jaeger-v2/values.yaml
@@ -86,4 +86,4 @@ resources:
     memory: 512Mi
   requests:
     cpu: 100m
-    memory: 256Mi
\ No newline at end of file
+    memory: 256Mi