patch

signalfx · Jun 27, 2023 · 1c65741 · 1c65741
1 parent 3db1375
commit 1c65741
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/helm-charts/splunk-otel-collector/templates/operator/_helpers.tpl b/helm-charts/splunk-otel-collector/templates/operator/_helpers.tpl
@@ -1,7 +1,7 @@
 {{- define "validation-rules" -}}
 {{- $tracesEnabled := or (include "splunk-otel-collector.platformTracesEnabled" .) (include "splunk-otel-collector.o11yTracesEnabled" .) -}}
 {{- $endpointOverridden := and .Values.operator.instrumentation.spec .Values.operator.instrumentation.spec.exporter .Values.operator.instrumentation.spec.exporter.endpoint (ne .Values.operator.instrumentation.spec.exporter.endpoint "") -}}
-{{- if and .Values.operator.enabled .Values.operator.instrumentation.create $tracesEnabled (not $endpointOverridden) -}}
+{{- if and .Values.operator.enabled $tracesEnabled (not $endpointOverridden) -}}
   {{/*  If no endpoint override was provided, the environment variable/tag must be set by the agent, gateway, or instrumentation.*/}}
   {{- if or (not .Values.environment) (eq .Values.environment "") -}}
     {{- $envSet := false -}}

diff --git a/helm-charts/splunk-otel-collector/templates/operator/_instrumentationSpec.yaml b/helm-charts/splunk-otel-collector/templates/operator/_instrumentationSpec.yaml
@@ -1,5 +1,5 @@
 {{- define "splunk-otel-collector.operator.instrumentation.spec" -}}
-{{- if and .Values.operator.enabled .Values.operator.instrumentation.create }}
+{{- if .Values.operator.enabled }}
 exporter:
   endpoint: {{- include "splunk-otel-collector.operator.instrumentation.exporter.endpoint" . | nindent 4 }}
 propagators:

diff --git a/helm-charts/splunk-otel-collector/templates/operator/instrumentation.yaml b/helm-charts/splunk-otel-collector/templates/operator/instrumentation.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.operator.enabled .Values.operator.instrumentation.create }}
+{{- if .Values.operator.enabled }}
 {{- include "validation-rules" . -}}
 apiVersion: opentelemetry.io/v1alpha1
 kind: Instrumentation

diff --git a/helm-charts/splunk-otel-collector/values.yaml b/helm-charts/splunk-otel-collector/values.yaml
@@ -1369,7 +1369,6 @@ operator:
   enabled: false
   # For more details, refer to: https://github.com/open-telemetry/opentelemetry-operator/blob/main/docs/api.md#instrumentation
   instrumentation:
-    create: true
     # Overrides for default instrumentation configurations can be specified here.
     spec:
     # Optional "endpoint" parameter for exporting data to a specific target.
@@ -1381,13 +1380,11 @@ operator:
 
     # Optional "sampler" parameter for enabling trace sampling.
     # Refer to: https://opentelemetry.io/docs/concepts/sdk-configuration/general-sdk-configuration/#otel_traces_sampler
-    # Uncomment the following lines to specify a sampler:
     # sampler:
     #   type: traceidratio
     #   argument: "0.95"
 
     # Optional "environment variable" parameters that can configure all instrumentation libraries.
-    # Uncomment the following lines to specify environment variables:
     # env:
     #   # Sets the deployment.environment tag on spans
     #   - name: OTEL_RESOURCE_ATTRIBUTES