From 25a958bd9aa8dd022721b1d5b1889930feeeae30 Mon Sep 17 00:00:00 2001
From: kamal-devtron <kamal@devtron.ai>
Date: Wed, 2 Apr 2025 12:25:57 +0530
Subject: [PATCH 1/4] added support for namespace in jaeger chart

---
 charts/jaeger-opentelemetry/Chart.yaml                 | 2 +-
 charts/jaeger-opentelemetry/templates/ConfigMap.yaml   | 2 +-
 charts/jaeger-opentelemetry/templates/StatefulSet.yaml | 2 +-
 charts/jaeger-opentelemetry/templates/deployment.yaml  | 4 ++--
 charts/jaeger-opentelemetry/templates/service.yaml     | 2 +-
 charts/jaeger-opentelemetry/values.yaml                | 2 ++
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/charts/jaeger-opentelemetry/Chart.yaml b/charts/jaeger-opentelemetry/Chart.yaml
index e4358319..fd26122e 100644
--- a/charts/jaeger-opentelemetry/Chart.yaml
+++ b/charts/jaeger-opentelemetry/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 0.2.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/jaeger-opentelemetry/templates/ConfigMap.yaml b/charts/jaeger-opentelemetry/templates/ConfigMap.yaml
index 3d2ba743..92e7a8a9 100644
--- a/charts/jaeger-opentelemetry/templates/ConfigMap.yaml
+++ b/charts/jaeger-opentelemetry/templates/ConfigMap.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ .Release.Name }}-config
-  namespace: opentelemetry
+  namespace: {{ .Values.namespace }}
   labels:
    {{- include "optl-label" . | nindent 3 }}
 data:
diff --git a/charts/jaeger-opentelemetry/templates/StatefulSet.yaml b/charts/jaeger-opentelemetry/templates/StatefulSet.yaml
index 957e252d..9a84d0be 100644
--- a/charts/jaeger-opentelemetry/templates/StatefulSet.yaml
+++ b/charts/jaeger-opentelemetry/templates/StatefulSet.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
  name: {{ .Release.Name }}-jaeger-all-in-one
- namespace: opentelemetry
+ namespace: {{ .Values.namespace }}
  labels:
    {{- include "stateful label" . | nindent 3 }}
 spec: 
diff --git a/charts/jaeger-opentelemetry/templates/deployment.yaml b/charts/jaeger-opentelemetry/templates/deployment.yaml
index 60316ae7..18de1663 100644
--- a/charts/jaeger-opentelemetry/templates/deployment.yaml
+++ b/charts/jaeger-opentelemetry/templates/deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: {{ .Release.Name }}-optl-deployment
- namespace: opentelemetry
+ namespace: {{ .Values.namespace}}
  labels:
    {{- include "deployment-optl label" . | nindent 3 }}
 spec:
@@ -14,7 +14,7 @@ spec:
  template:
    metadata:
      name: {{ .Release.Name }}-optl
-     namespace: opentelemetry
+     namespace: {{ .Values.namespace }}
      labels:
        {{- include "deployment-optl label" . | nindent 7 }}
    spec:
diff --git a/charts/jaeger-opentelemetry/templates/service.yaml b/charts/jaeger-opentelemetry/templates/service.yaml
index 7b8f7dc3..2f936298 100644
--- a/charts/jaeger-opentelemetry/templates/service.yaml
+++ b/charts/jaeger-opentelemetry/templates/service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
  name: {{ .Release.Name }}-optl
- namespace: opentelemetry
+ namespace: {{ .Values.namespace }}
  labels:
    app: opentelemetry
    component: otel-collector
diff --git a/charts/jaeger-opentelemetry/values.yaml b/charts/jaeger-opentelemetry/values.yaml
index 56d58780..260c39df 100644
--- a/charts/jaeger-opentelemetry/values.yaml
+++ b/charts/jaeger-opentelemetry/values.yaml
@@ -131,3 +131,5 @@ ingress:
     #- secretName: chart-example-tls
     #  hosts:
       #  - chart-example.local
+
+namespace: opentelemetry
\ No newline at end of file

From c53174737ee07064755eda7933fda3b9f09f2a9d Mon Sep 17 00:00:00 2001
From: kamal-devtron <kamal@devtron.ai>
Date: Wed, 2 Apr 2025 12:36:59 +0530
Subject: [PATCH 2/4] added default value

---
 charts/jaeger-opentelemetry/templates/ConfigMap.yaml   | 2 +-
 charts/jaeger-opentelemetry/templates/StatefulSet.yaml | 2 +-
 charts/jaeger-opentelemetry/templates/deployment.yaml  | 2 +-
 charts/jaeger-opentelemetry/templates/ingress.yaml     | 1 +
 charts/jaeger-opentelemetry/templates/service.yaml     | 2 +-
 charts/jaeger-opentelemetry/values.yaml                | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/charts/jaeger-opentelemetry/templates/ConfigMap.yaml b/charts/jaeger-opentelemetry/templates/ConfigMap.yaml
index 92e7a8a9..45bbfa59 100644
--- a/charts/jaeger-opentelemetry/templates/ConfigMap.yaml
+++ b/charts/jaeger-opentelemetry/templates/ConfigMap.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ .Release.Name }}-config
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Values.namespace | default "opentelemetry" }}
   labels:
    {{- include "optl-label" . | nindent 3 }}
 data:
diff --git a/charts/jaeger-opentelemetry/templates/StatefulSet.yaml b/charts/jaeger-opentelemetry/templates/StatefulSet.yaml
index 9a84d0be..b60cd9fe 100644
--- a/charts/jaeger-opentelemetry/templates/StatefulSet.yaml
+++ b/charts/jaeger-opentelemetry/templates/StatefulSet.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
  name: {{ .Release.Name }}-jaeger-all-in-one
- namespace: {{ .Values.namespace }}
+ namespace: {{ .Values.namespace | default "opentelemetry" }}
  labels:
    {{- include "stateful label" . | nindent 3 }}
 spec: 
diff --git a/charts/jaeger-opentelemetry/templates/deployment.yaml b/charts/jaeger-opentelemetry/templates/deployment.yaml
index 18de1663..4399232e 100644
--- a/charts/jaeger-opentelemetry/templates/deployment.yaml
+++ b/charts/jaeger-opentelemetry/templates/deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: {{ .Release.Name }}-optl-deployment
- namespace: {{ .Values.namespace}}
+ namespace: {{ .Values.namespace | default "opentelemetry" }}
  labels:
    {{- include "deployment-optl label" . | nindent 3 }}
 spec:
diff --git a/charts/jaeger-opentelemetry/templates/ingress.yaml b/charts/jaeger-opentelemetry/templates/ingress.yaml
index a297f934..8bbe2885 100644
--- a/charts/jaeger-opentelemetry/templates/ingress.yaml
+++ b/charts/jaeger-opentelemetry/templates/ingress.yaml
@@ -23,6 +23,7 @@ metadata:
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
+  namespace: {{ .Values.namespace | default "opentelemetry" }}
 spec:
   {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
   ingressClassName: {{ .Values.ingress.className }}
diff --git a/charts/jaeger-opentelemetry/templates/service.yaml b/charts/jaeger-opentelemetry/templates/service.yaml
index 2f936298..fb73979e 100644
--- a/charts/jaeger-opentelemetry/templates/service.yaml
+++ b/charts/jaeger-opentelemetry/templates/service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
  name: {{ .Release.Name }}-optl
- namespace: {{ .Values.namespace }}
+ namespace: {{ .Values.namespace | default "opentelemetry" }}
  labels:
    app: opentelemetry
    component: otel-collector
diff --git a/charts/jaeger-opentelemetry/values.yaml b/charts/jaeger-opentelemetry/values.yaml
index 260c39df..ee939f37 100644
--- a/charts/jaeger-opentelemetry/values.yaml
+++ b/charts/jaeger-opentelemetry/values.yaml
@@ -132,4 +132,4 @@ ingress:
     #  hosts:
       #  - chart-example.local
 
-namespace: opentelemetry
\ No newline at end of file
+namespace: ""
\ No newline at end of file

From ba9fdbb7b5dbe06dca6bda43669213cca8ec1f0c Mon Sep 17 00:00:00 2001
From: kamal-devtron <kamal@devtron.ai>
Date: Wed, 2 Apr 2025 15:31:50 +0530
Subject: [PATCH 3/4] hardcoded the headless service

---
 charts/jaeger-opentelemetry/templates/service.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/charts/jaeger-opentelemetry/templates/service.yaml b/charts/jaeger-opentelemetry/templates/service.yaml
index fb73979e..eeb44e36 100644
--- a/charts/jaeger-opentelemetry/templates/service.yaml
+++ b/charts/jaeger-opentelemetry/templates/service.yaml
@@ -22,8 +22,8 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Release.Name }}-jaeger-headless
-  namespace: opentelemetry
+  name: jaeger-headless
+  namespace: {{ .Values.namespace | default "opentelemetry" }}
   labels:
    app: opentelemetry
    component: optl-collector
@@ -43,7 +43,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ .Release.Name }}-jaeger-query
-  namespace: opentelemetry
+  namespace: {{ .Values.namespace | default "opentelemetry" }}
   labels:
    app: opentelemetry
    component: optl-collector

From a549650a962474c38b0f72ace79130bcccb39cb7 Mon Sep 17 00:00:00 2001
From: kamal-devtron <kamal@devtron.ai>
Date: Wed, 2 Apr 2025 17:52:21 +0530
Subject: [PATCH 4/4] namespace changes

---
 charts/jaeger-opentelemetry/templates/ConfigMap.yaml   | 2 +-
 charts/jaeger-opentelemetry/templates/StatefulSet.yaml | 2 +-
 charts/jaeger-opentelemetry/templates/deployment.yaml  | 4 ++--
 charts/jaeger-opentelemetry/templates/ingress.yaml     | 2 +-
 charts/jaeger-opentelemetry/templates/service.yaml     | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/charts/jaeger-opentelemetry/templates/ConfigMap.yaml b/charts/jaeger-opentelemetry/templates/ConfigMap.yaml
index 45bbfa59..58dca58c 100644
--- a/charts/jaeger-opentelemetry/templates/ConfigMap.yaml
+++ b/charts/jaeger-opentelemetry/templates/ConfigMap.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ .Release.Name }}-config
-  namespace: {{ .Values.namespace | default "opentelemetry" }}
+  namespace: {{ .Release.Namespace | default "opentelemetry" }}
   labels:
    {{- include "optl-label" . | nindent 3 }}
 data:
diff --git a/charts/jaeger-opentelemetry/templates/StatefulSet.yaml b/charts/jaeger-opentelemetry/templates/StatefulSet.yaml
index b60cd9fe..4b9b8dd6 100644
--- a/charts/jaeger-opentelemetry/templates/StatefulSet.yaml
+++ b/charts/jaeger-opentelemetry/templates/StatefulSet.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
  name: {{ .Release.Name }}-jaeger-all-in-one
- namespace: {{ .Values.namespace | default "opentelemetry" }}
+ namespace: {{ .Release.Namespace | default "opentelemetry" }}
  labels:
    {{- include "stateful label" . | nindent 3 }}
 spec: 
diff --git a/charts/jaeger-opentelemetry/templates/deployment.yaml b/charts/jaeger-opentelemetry/templates/deployment.yaml
index 4399232e..b1d38516 100644
--- a/charts/jaeger-opentelemetry/templates/deployment.yaml
+++ b/charts/jaeger-opentelemetry/templates/deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: {{ .Release.Name }}-optl-deployment
- namespace: {{ .Values.namespace | default "opentelemetry" }}
+ namespace: {{ .Release.Namespace | default "opentelemetry" }}
  labels:
    {{- include "deployment-optl label" . | nindent 3 }}
 spec:
@@ -14,7 +14,7 @@ spec:
  template:
    metadata:
      name: {{ .Release.Name }}-optl
-     namespace: {{ .Values.namespace }}
+     namespace: {{ .Release.Namespace | default "opentelemetry" }}}
      labels:
        {{- include "deployment-optl label" . | nindent 7 }}
    spec:
diff --git a/charts/jaeger-opentelemetry/templates/ingress.yaml b/charts/jaeger-opentelemetry/templates/ingress.yaml
index 8bbe2885..633081dd 100644
--- a/charts/jaeger-opentelemetry/templates/ingress.yaml
+++ b/charts/jaeger-opentelemetry/templates/ingress.yaml
@@ -23,7 +23,7 @@ metadata:
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  namespace: {{ .Values.namespace | default "opentelemetry" }}
+  namespace: {{ .Release.Namespace | default "opentelemetry" }}
 spec:
   {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
   ingressClassName: {{ .Values.ingress.className }}
diff --git a/charts/jaeger-opentelemetry/templates/service.yaml b/charts/jaeger-opentelemetry/templates/service.yaml
index eeb44e36..9b07a8c1 100644
--- a/charts/jaeger-opentelemetry/templates/service.yaml
+++ b/charts/jaeger-opentelemetry/templates/service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
  name: {{ .Release.Name }}-optl
- namespace: {{ .Values.namespace | default "opentelemetry" }}
+ namespace: {{ .Release.Namespace | default "opentelemetry" }}
  labels:
    app: opentelemetry
    component: otel-collector
@@ -23,7 +23,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: jaeger-headless
-  namespace: {{ .Values.namespace | default "opentelemetry" }}
+  namespace: {{ .Release.Namespace | default "opentelemetry" }}
   labels:
    app: opentelemetry
    component: optl-collector
@@ -43,7 +43,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ .Release.Name }}-jaeger-query
-  namespace: {{ .Values.namespace | default "opentelemetry" }}
+  namespace: {{ .Release.Namespace | default "opentelemetry" }}
   labels:
    app: opentelemetry
    component: optl-collector