Fix issue where SPLUNK_OTEL_AGENT env var was set before custom opear…

…tor.instrumentation.spec.env (#1292) * Fix issue where SPLUNK_OTEL_AGENT env var was set before custom operator.instrumentation.spec.env env vars * Update .chloggen/inst-update.yaml Co-authored-by: Curtis Robert <[email protected]> --------- Co-authored-by: release-bot <[email protected]> Co-authored-by: Curtis Robert <[email protected]>
signalfx · May 15, 2024 · 019225c · 019225c
1 parent 2d00190
commit 019225c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/.chloggen/inst-update.yaml b/.chloggen/inst-update.yaml
@@ -0,0 +1,12 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: bug_fix
+# The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, operator, chart, other)
+component: operator
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Fix issue where SPLUNK_OTEL_AGENT env var was set before custom operator.instrumentation.spec.env env vars
+# One or more tracking issues related to the change
+issues: [1292]
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
diff --git a/helm-charts/splunk-otel-collector/templates/operator/instrumentation.yaml b/helm-charts/splunk-otel-collector/templates/operator/instrumentation.yaml
@@ -25,9 +25,6 @@ spec:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   env:
-    {{- with .Values.operator.instrumentation.spec.env }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
     {{- if .Values.splunkObservability.profilingEnabled }}
     {{- if eq (include "splunk-otel-collector.operator.env-has" (dict "env" .Values.operator.instrumentation.spec.env "envName" "SPLUNK_PROFILER_ENABLED")) "false" }}
     - name: SPLUNK_PROFILER_ENABLED
@@ -45,5 +42,8 @@ spec:
           apiVersion: v1
           fieldPath: status.hostIP
     {{- end }}
+    {{- with .Values.operator.instrumentation.spec.env }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 {{ include "splunk-otel-collector.operator.instrumentation-libraries" . }}
 {{- end }}