Skip to content

Commit 019225c

Browse files
jvoravongsrv-gh-o11y-gdicrobert-1
authored
Fix issue where SPLUNK_OTEL_AGENT env var was set before custom opeartor.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]>
1 parent 2d00190 commit 019225c

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

.chloggen/inst-update.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2+
change_type: bug_fix
3+
# The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, operator, chart, other)
4+
component: operator
5+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
6+
note: Fix issue where SPLUNK_OTEL_AGENT env var was set before custom operator.instrumentation.spec.env env vars
7+
# One or more tracking issues related to the change
8+
issues: [1292]
9+
# (Optional) One or more lines of additional information to render under the primary note.
10+
# These lines will be padded with 2 spaces and then inserted directly into the document.
11+
# Use pipe (|) for multiline entries.
12+
subtext:

helm-charts/splunk-otel-collector/templates/operator/instrumentation.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ spec:
2525
{{- toYaml . | nindent 4 }}
2626
{{- end }}
2727
env:
28-
{{- with .Values.operator.instrumentation.spec.env }}
29-
{{- toYaml . | nindent 4 }}
30-
{{- end }}
3128
{{- if .Values.splunkObservability.profilingEnabled }}
3229
{{- if eq (include "splunk-otel-collector.operator.env-has" (dict "env" .Values.operator.instrumentation.spec.env "envName" "SPLUNK_PROFILER_ENABLED")) "false" }}
3330
- name: SPLUNK_PROFILER_ENABLED
@@ -45,5 +42,8 @@ spec:
4542
apiVersion: v1
4643
fieldPath: status.hostIP
4744
{{- end }}
45+
{{- with .Values.operator.instrumentation.spec.env }}
46+
{{- toYaml . | nindent 4 }}
47+
{{- end }}
4848
{{ include "splunk-otel-collector.operator.instrumentation-libraries" . }}
4949
{{- end }}

0 commit comments

Comments
 (0)