fix: Allow for custom otel collector environment variables (#46)

Author: teeohhem

.changeset/lucky-paws-occur.md

@@ -0,0 +1,5 @@
+---
+"helm-charts": patch
+---
+
+fix: Allow for custom otel collector environment variables

charts/hdx-oss-v2/templates/otel-collector-deployment.yaml

@@ -52,6 +52,9 @@ spec:
               value: {{ .Values.otel.clickhouseUser | default .Values.clickhouse.config.users.otelUserName }}
             - name: CLICKHOUSE_PASSWORD
               value: {{ .Values.otel.clickhousePassword | default .Values.clickhouse.config.users.otelUserPassword }}
+            {{- with .Values.otel.env }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
 ---
 apiVersion: v1
 kind: Service

charts/hdx-oss-v2/tests/otel-collector_test.yaml

@@ -431,3 +431,85 @@ tests:
           content:
             name: CLICKHOUSE_PASSWORD
             value: "custom-password"
+
+  - it: should render custom environment variables when specified
+    set:
+      otel:
+        enabled: true
+        image:
+          repository: hyperdx/hyperdx-otel-collector
+          tag: 2-beta
+        env:
+          - name: CUSTOM_VAR
+            value: "custom-value"
+          - name: DEBUG_MODE
+            value: "true"
+          - name: SECRET_TOKEN
+            valueFrom:
+              secretKeyRef:
+                name: my-secret
+                key: token
+      hyperdx:
+        image:
+          repository: hyperdx/hyperdx
+          tag: 2-beta
+        logLevel: info
+      clickhouse:
+        config:
+          users:
+            otelUserPassword: test-password
+    release:
+      name: test-release
+    asserts:
+      - documentIndex: 0
+        isKind:
+          of: Deployment
+      - documentIndex: 0
+        contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: CUSTOM_VAR
+            value: "custom-value"
+      - documentIndex: 0
+        contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: DEBUG_MODE
+            value: "true"
+      - documentIndex: 0
+        contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: SECRET_TOKEN
+            valueFrom:
+              secretKeyRef:
+                name: my-secret
+                key: token
+
+  - it: should not render custom environment variables when not specified
+    set:
+      otel:
+        enabled: true
+        image:
+          repository: hyperdx/hyperdx-otel-collector
+          tag: 2-beta
+      hyperdx:
+        image:
+          repository: hyperdx/hyperdx
+          tag: 2-beta
+        logLevel: info
+      clickhouse:
+        config:
+          users:
+            otelUserPassword: test-password
+    release:
+      name: test-release
+    asserts:
+      - documentIndex: 0
+        isKind:
+          of: Deployment
+      - documentIndex: 0
+        notContains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: CUSTOM_VAR

charts/hdx-oss-v2/values.yaml

@@ -220,6 +220,16 @@ otel:
   httpPort: 4318
   healthPort: 8888
   enabled: true
+  env: []
+    # Additional environment variables can be configured here
+    # Example:
+    # - name: CUSTOM_VAR
+    #   value: "my-value"
+    # - name: SECRET_VAR
+    #   valueFrom:
+    #     secretKeyRef:
+    #       name: my-secret
+    #       key: secret-key
   # Opamp server URL - defaults to the app service. Customize if you want to use a different Opamp server.
   # Leave empty if you want to use the app service.
   # Example: opampServerUrl: "http://custom-opamp-server:4320"