Merge pull request #332 from devtron-labs/otl-jaeger

chore: Adding the support for namespace

Author: YashasviDevtron

charts/jaeger-opentelemetry/Chart.yaml

@@ -15,10 +15,10 @@ 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.1
+version: 0.1.2
 
 # 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
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.16.1"
+appVersion: "1.16.2"

charts/jaeger-opentelemetry/templates/ConfigMap.yaml

@@ -2,8 +2,8 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ .Release.Name }}-config
-  namespace: opentelemetry
+  namespace: {{ $.Values.namespace | default "opentelemetry" }}
   labels:
    {{- include "optl-label" . | nindent 3 }}
 data:
-  optl-collector-config: {{toYaml .Values.optl_collector_config | indent  4}}
+  optl-collector-config: {{toYaml .Values.optl_collector_config | indent  4}}

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 | default "opentelemetry" }}
  labels:
    {{- include "stateful label" . | nindent 3 }}
 spec: 

charts/jaeger-opentelemetry/templates/deployment.yaml

@@ -1,8 +1,8 @@
 apiVersion: apps/v1
-kind: Deployment
+kind: Deployment 
 metadata:
  name: {{ .Release.Name }}-optl-deployment
- namespace: opentelemetry
+ namespace: {{ $.Values.namespace | default "opentelemetry" }}
  labels:
    {{- include "deployment-optl label" . | nindent 3 }}
 spec:
@@ -14,7 +14,6 @@ spec:
  template:
    metadata:
      name: {{ .Release.Name }}-optl
-     namespace: opentelemetry
      labels:
        {{- include "deployment-optl label" . | nindent 7 }}
    spec:

charts/jaeger-opentelemetry/templates/service.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
  name: {{ .Release.Name }}-optl
- namespace: opentelemetry
+ namespace: {{ $.Values.namespace | default "opentelemetry" }}
  labels:
    app: opentelemetry
    component: otel-collector
@@ -23,7 +23,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ .Release.Name }}-jaeger-headless
-  namespace: opentelemetry
+  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

charts/jaeger-opentelemetry/values.yaml

@@ -1,3 +1,6 @@
+#if  namespace is not specified, it defaults to opentelemetry
+namespace: ""
+
 #config_map
 optl_collector_config: |
     receivers:
@@ -73,9 +76,9 @@ optl_service:
   #    port: 13133
   #    protocol: TCP
   #    targetPort: 13133
-     selector:
-       app: opentelemetry
-       name: optl
+    # selector:
+     #  app: opentelemetry
+     #  name: optl
 
 # service for jaeger-headless
 jaeger_servie_ports: