From e6a51b431ce6c4ee9312de42a3ecf0ca14c547da Mon Sep 17 00:00:00 2001 From: Dmitry Anoshin Date: Tue, 8 Apr 2025 18:09:00 -0700 Subject: [PATCH] Don't hardcode the command in the pod specs Use the entrypoint defined in the image instead. This allows using the other images of the collector where the command is different, e.g. upstream core, k8s or contrib images. --- .chloggen/dont-hardcode-command.yaml | 8 ++++++++ .../rendered_manifests/daemonset.yaml | 3 +-- .../deployment-cluster-receiver.yaml | 3 +-- .../rendered_manifests/daemonset.yaml | 3 +-- .../deployment-cluster-receiver.yaml | 3 +-- .../rendered_manifests/daemonset.yaml | 3 +-- .../deployment-cluster-receiver.yaml | 3 +-- examples/add-sampler/rendered_manifests/daemonset.yaml | 3 +-- .../deployment-cluster-receiver.yaml | 3 +-- .../autodetect-istio/rendered_manifests/daemonset.yaml | 3 +-- .../deployment-cluster-receiver.yaml | 3 +-- .../rendered_manifests/daemonset.yaml | 3 +-- .../rendered_manifests/daemonset.yaml | 3 +-- .../deployment-cluster-receiver.yaml | 3 +-- .../rendered_manifests/deployment-gateway.yaml | 3 +-- .../deployment-cluster-receiver.yaml | 3 +-- .../rendered_manifests/deployment-gateway.yaml | 3 +-- .../rendered_manifests/daemonset.yaml | 3 +-- .../deployment-cluster-receiver.yaml | 3 +-- .../crio-logging/rendered_manifests/daemonset.yaml | 3 +-- .../deployment-cluster-receiver.yaml | 3 +-- examples/default/rendered_manifests/daemonset.yaml | 3 +-- .../deployment-cluster-receiver.yaml | 3 +-- .../rendered_manifests/daemonset.yaml | 3 +-- .../deployment-cluster-receiver.yaml | 3 +-- .../discovery-mode/rendered_manifests/daemonset.yaml | 3 +-- .../distribution-aks/rendered_manifests/daemonset.yaml | 3 +-- .../deployment-cluster-receiver.yaml | 3 +-- .../deployment-cluster-receiver.yaml | 3 +-- .../rendered_manifests/deployment-gateway.yaml | 3 +-- .../distribution-eks/rendered_manifests/daemonset.yaml | 3 +-- .../deployment-cluster-receiver.yaml | 3 +-- .../deployment-cluster-receiver.yaml | 3 +-- .../distribution-gke/rendered_manifests/daemonset.yaml | 3 +-- .../deployment-cluster-receiver.yaml | 3 +-- .../rendered_manifests/daemonset.yaml | 3 +-- .../deployment-cluster-receiver.yaml | 3 +-- .../rendered_manifests/daemonset.yaml | 3 +-- .../deployment-cluster-receiver.yaml | 3 +-- .../rendered_manifests/daemonset.yaml | 3 +-- .../deployment-cluster-receiver.yaml | 3 +-- .../rendered_manifests/daemonset.yaml | 3 +-- .../rendered_manifests/daemonset.yaml | 3 +-- .../deployment-cluster-receiver.yaml | 3 +-- .../rendered_manifests/daemonset.yaml | 3 +-- .../deployment-cluster-receiver.yaml | 3 +-- .../rendered_manifests/daemonset.yaml | 3 +-- .../deployment-cluster-receiver.yaml | 3 +-- .../rendered_manifests/daemonset.yaml | 5 +---- .../deployment-cluster-receiver.yaml | 5 +---- .../multi-metrics/rendered_manifests/daemonset.yaml | 3 +-- .../deployment-cluster-receiver.yaml | 3 +-- .../rendered_manifests/daemonset.yaml | 3 +-- .../only-logs-otel/rendered_manifests/daemonset.yaml | 3 +-- .../rendered_manifests/daemonset.yaml | 3 +-- .../rendered_manifests/daemonset.yaml | 3 +-- .../deployment-cluster-receiver.yaml | 3 +-- .../only-metrics/rendered_manifests/daemonset.yaml | 3 +-- .../deployment-cluster-receiver.yaml | 3 +-- examples/only-traces/rendered_manifests/daemonset.yaml | 3 +-- .../rendered_manifests/daemonset.yaml | 3 +-- .../deployment-cluster-receiver.yaml | 3 +-- .../rendered_manifests/daemonset.yaml | 3 +-- .../rendered_manifests/daemonset.yaml | 3 +-- .../target-allocator/rendered_manifests/daemonset.yaml | 3 +-- .../deployment-cluster-receiver.yaml | 3 +-- examples/use-proxy/rendered_manifests/daemonset.yaml | 3 +-- .../deployment-cluster-receiver.yaml | 3 +-- .../rendered_manifests/daemonset.yaml | 3 +-- .../deployment-cluster-receiver.yaml | 3 +-- .../splunk-otel-collector/templates/daemonset.yaml | 9 +++++---- .../templates/deployment-cluster-receiver.yaml | 10 ++-------- .../templates/deployment-gateway.yaml | 6 +----- 73 files changed, 85 insertions(+), 159 deletions(-) create mode 100644 .chloggen/dont-hardcode-command.yaml diff --git a/.chloggen/dont-hardcode-command.yaml b/.chloggen/dont-hardcode-command.yaml new file mode 100644 index 0000000000..e9f5aa2390 --- /dev/null +++ b/.chloggen/dont-hardcode-command.yaml @@ -0,0 +1,8 @@ +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement +# The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, operator, chart, other) +component: all +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Don't hardcode the command in the pod specs +# One or more tracking issues related to the change +issues: [1758] diff --git a/examples/add-filter-processor/rendered_manifests/daemonset.yaml b/examples/add-filter-processor/rendered_manifests/daemonset.yaml index dc4314597f..e0acd2cc23 100644 --- a/examples/add-filter-processor/rendered_manifests/daemonset.yaml +++ b/examples/add-filter-processor/rendered_manifests/daemonset.yaml @@ -56,8 +56,7 @@ spec: initContainers: containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml ports: - name: fluentforward diff --git a/examples/add-filter-processor/rendered_manifests/deployment-cluster-receiver.yaml b/examples/add-filter-processor/rendered_manifests/deployment-cluster-receiver.yaml index a13f79c68f..440ca52b6d 100644 --- a/examples/add-filter-processor/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/add-filter-processor/rendered_manifests/deployment-cluster-receiver.yaml @@ -38,8 +38,7 @@ spec: kubernetes.io/os: linux containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml image: quay.io/signalfx/splunk-otel-collector:0.122.0 imagePullPolicy: IfNotPresent diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml index 326373ff26..b30eeb9cde 100644 --- a/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml +++ b/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml @@ -56,8 +56,7 @@ spec: initContainers: containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml ports: - name: fluentforward diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/deployment-cluster-receiver.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/deployment-cluster-receiver.yaml index a13f79c68f..440ca52b6d 100644 --- a/examples/add-kafkametrics-receiver/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/add-kafkametrics-receiver/rendered_manifests/deployment-cluster-receiver.yaml @@ -38,8 +38,7 @@ spec: kubernetes.io/os: linux containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml image: quay.io/signalfx/splunk-otel-collector:0.122.0 imagePullPolicy: IfNotPresent diff --git a/examples/add-receiver-creator/rendered_manifests/daemonset.yaml b/examples/add-receiver-creator/rendered_manifests/daemonset.yaml index 342793686b..7c011223ed 100644 --- a/examples/add-receiver-creator/rendered_manifests/daemonset.yaml +++ b/examples/add-receiver-creator/rendered_manifests/daemonset.yaml @@ -55,8 +55,7 @@ spec: operator: Exists containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml ports: - name: jaeger-grpc diff --git a/examples/add-receiver-creator/rendered_manifests/deployment-cluster-receiver.yaml b/examples/add-receiver-creator/rendered_manifests/deployment-cluster-receiver.yaml index a13f79c68f..440ca52b6d 100644 --- a/examples/add-receiver-creator/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/add-receiver-creator/rendered_manifests/deployment-cluster-receiver.yaml @@ -38,8 +38,7 @@ spec: kubernetes.io/os: linux containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml image: quay.io/signalfx/splunk-otel-collector:0.122.0 imagePullPolicy: IfNotPresent diff --git a/examples/add-sampler/rendered_manifests/daemonset.yaml b/examples/add-sampler/rendered_manifests/daemonset.yaml index d12d38d82c..6dab26a429 100644 --- a/examples/add-sampler/rendered_manifests/daemonset.yaml +++ b/examples/add-sampler/rendered_manifests/daemonset.yaml @@ -55,8 +55,7 @@ spec: operator: Exists containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml ports: - name: jaeger-grpc diff --git a/examples/add-sampler/rendered_manifests/deployment-cluster-receiver.yaml b/examples/add-sampler/rendered_manifests/deployment-cluster-receiver.yaml index a13f79c68f..440ca52b6d 100644 --- a/examples/add-sampler/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/add-sampler/rendered_manifests/deployment-cluster-receiver.yaml @@ -38,8 +38,7 @@ spec: kubernetes.io/os: linux containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml image: quay.io/signalfx/splunk-otel-collector:0.122.0 imagePullPolicy: IfNotPresent diff --git a/examples/autodetect-istio/rendered_manifests/daemonset.yaml b/examples/autodetect-istio/rendered_manifests/daemonset.yaml index 1339785a27..552463f4f4 100644 --- a/examples/autodetect-istio/rendered_manifests/daemonset.yaml +++ b/examples/autodetect-istio/rendered_manifests/daemonset.yaml @@ -57,8 +57,7 @@ spec: initContainers: containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml ports: - name: fluentforward diff --git a/examples/autodetect-istio/rendered_manifests/deployment-cluster-receiver.yaml b/examples/autodetect-istio/rendered_manifests/deployment-cluster-receiver.yaml index da1e3d8b32..c8b40cdff9 100644 --- a/examples/autodetect-istio/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/autodetect-istio/rendered_manifests/deployment-cluster-receiver.yaml @@ -39,8 +39,7 @@ spec: kubernetes.io/os: linux containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml image: quay.io/signalfx/splunk-otel-collector:0.122.0 imagePullPolicy: IfNotPresent diff --git a/examples/collector-agent-only/rendered_manifests/daemonset.yaml b/examples/collector-agent-only/rendered_manifests/daemonset.yaml index d39dac76ce..9c4e83bf0f 100644 --- a/examples/collector-agent-only/rendered_manifests/daemonset.yaml +++ b/examples/collector-agent-only/rendered_manifests/daemonset.yaml @@ -55,8 +55,7 @@ spec: operator: Exists containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml ports: - name: jaeger-grpc diff --git a/examples/collector-all-modes/rendered_manifests/daemonset.yaml b/examples/collector-all-modes/rendered_manifests/daemonset.yaml index ca67051f0f..c2b88644e0 100644 --- a/examples/collector-all-modes/rendered_manifests/daemonset.yaml +++ b/examples/collector-all-modes/rendered_manifests/daemonset.yaml @@ -55,8 +55,7 @@ spec: operator: Exists containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml ports: - name: jaeger-grpc diff --git a/examples/collector-all-modes/rendered_manifests/deployment-cluster-receiver.yaml b/examples/collector-all-modes/rendered_manifests/deployment-cluster-receiver.yaml index a13f79c68f..440ca52b6d 100644 --- a/examples/collector-all-modes/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/collector-all-modes/rendered_manifests/deployment-cluster-receiver.yaml @@ -38,8 +38,7 @@ spec: kubernetes.io/os: linux containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml image: quay.io/signalfx/splunk-otel-collector:0.122.0 imagePullPolicy: IfNotPresent diff --git a/examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml b/examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml index 3d8a3987d0..39a0caae0d 100644 --- a/examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml +++ b/examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml @@ -38,8 +38,7 @@ spec: kubernetes.io/os: linux containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml image: quay.io/signalfx/splunk-otel-collector:0.122.0 imagePullPolicy: IfNotPresent diff --git a/examples/collector-cluster-receiver-only/rendered_manifests/deployment-cluster-receiver.yaml b/examples/collector-cluster-receiver-only/rendered_manifests/deployment-cluster-receiver.yaml index 38ac880667..7e2d6fe8ff 100644 --- a/examples/collector-cluster-receiver-only/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/collector-cluster-receiver-only/rendered_manifests/deployment-cluster-receiver.yaml @@ -38,8 +38,7 @@ spec: kubernetes.io/os: linux containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml image: quay.io/signalfx/splunk-otel-collector:0.122.0 imagePullPolicy: IfNotPresent diff --git a/examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml b/examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml index 5ad7cc7bef..ef3262f933 100644 --- a/examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml +++ b/examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml @@ -38,8 +38,7 @@ spec: kubernetes.io/os: linux containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml image: quay.io/signalfx/splunk-otel-collector:0.122.0 imagePullPolicy: IfNotPresent diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml index 50bf83b9e2..cfad32183d 100644 --- a/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml +++ b/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml @@ -55,8 +55,7 @@ spec: operator: Exists containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml ports: - name: jaeger-grpc diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/deployment-cluster-receiver.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/deployment-cluster-receiver.yaml index a13f79c68f..440ca52b6d 100644 --- a/examples/controlplane-histogram-metrics/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/controlplane-histogram-metrics/rendered_manifests/deployment-cluster-receiver.yaml @@ -38,8 +38,7 @@ spec: kubernetes.io/os: linux containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml image: quay.io/signalfx/splunk-otel-collector:0.122.0 imagePullPolicy: IfNotPresent diff --git a/examples/crio-logging/rendered_manifests/daemonset.yaml b/examples/crio-logging/rendered_manifests/daemonset.yaml index d39dac76ce..9c4e83bf0f 100644 --- a/examples/crio-logging/rendered_manifests/daemonset.yaml +++ b/examples/crio-logging/rendered_manifests/daemonset.yaml @@ -55,8 +55,7 @@ spec: operator: Exists containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml ports: - name: jaeger-grpc diff --git a/examples/crio-logging/rendered_manifests/deployment-cluster-receiver.yaml b/examples/crio-logging/rendered_manifests/deployment-cluster-receiver.yaml index a13f79c68f..440ca52b6d 100644 --- a/examples/crio-logging/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/crio-logging/rendered_manifests/deployment-cluster-receiver.yaml @@ -38,8 +38,7 @@ spec: kubernetes.io/os: linux containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml image: quay.io/signalfx/splunk-otel-collector:0.122.0 imagePullPolicy: IfNotPresent diff --git a/examples/default/rendered_manifests/daemonset.yaml b/examples/default/rendered_manifests/daemonset.yaml index d39dac76ce..9c4e83bf0f 100644 --- a/examples/default/rendered_manifests/daemonset.yaml +++ b/examples/default/rendered_manifests/daemonset.yaml @@ -55,8 +55,7 @@ spec: operator: Exists containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml ports: - name: jaeger-grpc diff --git a/examples/default/rendered_manifests/deployment-cluster-receiver.yaml b/examples/default/rendered_manifests/deployment-cluster-receiver.yaml index a13f79c68f..440ca52b6d 100644 --- a/examples/default/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/default/rendered_manifests/deployment-cluster-receiver.yaml @@ -38,8 +38,7 @@ spec: kubernetes.io/os: linux containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml image: quay.io/signalfx/splunk-otel-collector:0.122.0 imagePullPolicy: IfNotPresent diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml index 97a0d2e299..8d62451c30 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml @@ -56,8 +56,7 @@ spec: initContainers: containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml ports: - name: fluentforward diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/deployment-cluster-receiver.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/deployment-cluster-receiver.yaml index 55c86d88de..a370fc9309 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/deployment-cluster-receiver.yaml @@ -38,8 +38,7 @@ spec: kubernetes.io/os: linux containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml image: quay.io/signalfx/splunk-otel-collector:0.122.0 imagePullPolicy: IfNotPresent diff --git a/examples/discovery-mode/rendered_manifests/daemonset.yaml b/examples/discovery-mode/rendered_manifests/daemonset.yaml index 300d81d851..569c6daf5e 100644 --- a/examples/discovery-mode/rendered_manifests/daemonset.yaml +++ b/examples/discovery-mode/rendered_manifests/daemonset.yaml @@ -55,8 +55,7 @@ spec: operator: Exists containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml - --discovery ports: diff --git a/examples/distribution-aks/rendered_manifests/daemonset.yaml b/examples/distribution-aks/rendered_manifests/daemonset.yaml index 0105207ff8..e584381344 100644 --- a/examples/distribution-aks/rendered_manifests/daemonset.yaml +++ b/examples/distribution-aks/rendered_manifests/daemonset.yaml @@ -55,8 +55,7 @@ spec: operator: Exists containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml ports: - name: jaeger-grpc diff --git a/examples/distribution-aks/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-aks/rendered_manifests/deployment-cluster-receiver.yaml index 0dc9b4ca33..eb70a35406 100644 --- a/examples/distribution-aks/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-aks/rendered_manifests/deployment-cluster-receiver.yaml @@ -38,8 +38,7 @@ spec: kubernetes.io/os: linux containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml image: quay.io/signalfx/splunk-otel-collector:0.122.0 imagePullPolicy: IfNotPresent diff --git a/examples/distribution-eks-fargate/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-eks-fargate/rendered_manifests/deployment-cluster-receiver.yaml index 7086500315..a7a3aef2c9 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/deployment-cluster-receiver.yaml @@ -71,8 +71,7 @@ spec: name: collector-configmap containers: - name: otel-collector - command: - - /otelcol + args: - --config=/splunk-messages/config.yaml image: quay.io/signalfx/splunk-otel-collector:0.122.0 imagePullPolicy: IfNotPresent diff --git a/examples/distribution-eks-fargate/rendered_manifests/deployment-gateway.yaml b/examples/distribution-eks-fargate/rendered_manifests/deployment-gateway.yaml index 419e6baf08..a50afd6323 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/deployment-gateway.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/deployment-gateway.yaml @@ -38,8 +38,7 @@ spec: kubernetes.io/os: linux containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml image: quay.io/signalfx/splunk-otel-collector:0.122.0 imagePullPolicy: IfNotPresent diff --git a/examples/distribution-eks/rendered_manifests/daemonset.yaml b/examples/distribution-eks/rendered_manifests/daemonset.yaml index df8dbb9b04..44795b87aa 100644 --- a/examples/distribution-eks/rendered_manifests/daemonset.yaml +++ b/examples/distribution-eks/rendered_manifests/daemonset.yaml @@ -55,8 +55,7 @@ spec: operator: Exists containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml ports: - name: jaeger-grpc diff --git a/examples/distribution-eks/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-eks/rendered_manifests/deployment-cluster-receiver.yaml index d2fb2fe145..207f2aa75c 100644 --- a/examples/distribution-eks/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-eks/rendered_manifests/deployment-cluster-receiver.yaml @@ -38,8 +38,7 @@ spec: kubernetes.io/os: linux containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml image: quay.io/signalfx/splunk-otel-collector:0.122.0 imagePullPolicy: IfNotPresent diff --git a/examples/distribution-gke-autopilot/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-gke-autopilot/rendered_manifests/deployment-cluster-receiver.yaml index e321247d0c..1153c8a983 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/deployment-cluster-receiver.yaml @@ -38,8 +38,7 @@ spec: kubernetes.io/os: linux containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml image: quay.io/signalfx/splunk-otel-collector:0.122.0 imagePullPolicy: IfNotPresent diff --git a/examples/distribution-gke/rendered_manifests/daemonset.yaml b/examples/distribution-gke/rendered_manifests/daemonset.yaml index afd534c067..07586bc139 100644 --- a/examples/distribution-gke/rendered_manifests/daemonset.yaml +++ b/examples/distribution-gke/rendered_manifests/daemonset.yaml @@ -55,8 +55,7 @@ spec: operator: Exists containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml ports: - name: jaeger-grpc diff --git a/examples/distribution-gke/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-gke/rendered_manifests/deployment-cluster-receiver.yaml index e321247d0c..1153c8a983 100644 --- a/examples/distribution-gke/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-gke/rendered_manifests/deployment-cluster-receiver.yaml @@ -38,8 +38,7 @@ spec: kubernetes.io/os: linux containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml image: quay.io/signalfx/splunk-otel-collector:0.122.0 imagePullPolicy: IfNotPresent diff --git a/examples/distribution-openshift/rendered_manifests/daemonset.yaml b/examples/distribution-openshift/rendered_manifests/daemonset.yaml index 0ee22ad78d..6f19379184 100644 --- a/examples/distribution-openshift/rendered_manifests/daemonset.yaml +++ b/examples/distribution-openshift/rendered_manifests/daemonset.yaml @@ -55,8 +55,7 @@ spec: operator: Exists containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml ports: - name: jaeger-grpc diff --git a/examples/distribution-openshift/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-openshift/rendered_manifests/deployment-cluster-receiver.yaml index e4b92c69b2..12a4c7bfb8 100644 --- a/examples/distribution-openshift/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-openshift/rendered_manifests/deployment-cluster-receiver.yaml @@ -38,8 +38,7 @@ spec: kubernetes.io/os: linux containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml image: quay.io/signalfx/splunk-otel-collector:0.122.0 imagePullPolicy: IfNotPresent diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml index 9372ea0f5c..f2f7b53cc4 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml @@ -56,8 +56,7 @@ spec: initContainers: containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml ports: - name: fluentforward diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/deployment-cluster-receiver.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/deployment-cluster-receiver.yaml index 98e7c3c397..2d5c822959 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/deployment-cluster-receiver.yaml @@ -38,8 +38,7 @@ spec: kubernetes.io/os: linux containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml image: quay.io/signalfx/splunk-otel-collector:0.122.0 imagePullPolicy: IfNotPresent diff --git a/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml b/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml index b6351856c3..a2e4d32482 100644 --- a/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml @@ -56,8 +56,7 @@ spec: initContainers: containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml ports: - name: fluentforward diff --git a/examples/enable-persistence-queue/rendered_manifests/deployment-cluster-receiver.yaml b/examples/enable-persistence-queue/rendered_manifests/deployment-cluster-receiver.yaml index 55c86d88de..a370fc9309 100644 --- a/examples/enable-persistence-queue/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/deployment-cluster-receiver.yaml @@ -38,8 +38,7 @@ spec: kubernetes.io/os: linux containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml image: quay.io/signalfx/splunk-otel-collector:0.122.0 imagePullPolicy: IfNotPresent diff --git a/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml b/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml index 959b7bcf91..518c95a00d 100644 --- a/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml +++ b/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml @@ -55,8 +55,7 @@ spec: operator: Exists containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml ports: - name: jaeger-grpc diff --git a/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml b/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml index bc293cbe3b..7fd752598c 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml @@ -55,8 +55,7 @@ spec: operator: Exists containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml ports: - name: jaeger-grpc diff --git a/examples/enabled-pprof-extension/rendered_manifests/deployment-cluster-receiver.yaml b/examples/enabled-pprof-extension/rendered_manifests/deployment-cluster-receiver.yaml index a13f79c68f..440ca52b6d 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/deployment-cluster-receiver.yaml @@ -38,8 +38,7 @@ spec: kubernetes.io/os: linux containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml image: quay.io/signalfx/splunk-otel-collector:0.122.0 imagePullPolicy: IfNotPresent diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml index b2e0facb8d..ad1f19b3ed 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml @@ -124,8 +124,7 @@ spec: - name: tmp mountPath: /tmp - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml ports: - name: fluentforward diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/deployment-cluster-receiver.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/deployment-cluster-receiver.yaml index a13f79c68f..440ca52b6d 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/deployment-cluster-receiver.yaml @@ -38,8 +38,7 @@ spec: kubernetes.io/os: linux containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml image: quay.io/signalfx/splunk-otel-collector:0.122.0 imagePullPolicy: IfNotPresent diff --git a/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml b/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml index 6f71d7cdc9..8f46a74fdc 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml @@ -124,8 +124,7 @@ spec: - name: tmp mountPath: /tmp - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml ports: - name: fluentforward diff --git a/examples/fluentd-refresh-interval/rendered_manifests/deployment-cluster-receiver.yaml b/examples/fluentd-refresh-interval/rendered_manifests/deployment-cluster-receiver.yaml index a13f79c68f..440ca52b6d 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/deployment-cluster-receiver.yaml @@ -38,8 +38,7 @@ spec: kubernetes.io/os: linux containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml image: quay.io/signalfx/splunk-otel-collector:0.122.0 imagePullPolicy: IfNotPresent diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml index 9c8656186e..2b495b1af6 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml @@ -54,10 +54,7 @@ spec: operator: Exists containers: - name: otel-collector - command: - - powershell.exe - - -command - - .\otelcol.exe + args: - --config=C:\\conf\relay.yaml ports: - name: fluentforward diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/deployment-cluster-receiver.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/deployment-cluster-receiver.yaml index 56868f577a..76d1af0863 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/deployment-cluster-receiver.yaml @@ -38,10 +38,7 @@ spec: kubernetes.io/os: windows containers: - name: otel-collector - command: - - powershell.exe - - -command - - .\otelcol.exe + args: - --config=C:\\conf\relay.yaml image: quay.io/signalfx/splunk-otel-collector-windows:0.122.0 imagePullPolicy: IfNotPresent diff --git a/examples/multi-metrics/rendered_manifests/daemonset.yaml b/examples/multi-metrics/rendered_manifests/daemonset.yaml index 4c3fe19cdc..c3a5043e8a 100644 --- a/examples/multi-metrics/rendered_manifests/daemonset.yaml +++ b/examples/multi-metrics/rendered_manifests/daemonset.yaml @@ -56,8 +56,7 @@ spec: initContainers: containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml ports: - name: fluentforward diff --git a/examples/multi-metrics/rendered_manifests/deployment-cluster-receiver.yaml b/examples/multi-metrics/rendered_manifests/deployment-cluster-receiver.yaml index 55c86d88de..a370fc9309 100644 --- a/examples/multi-metrics/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/multi-metrics/rendered_manifests/deployment-cluster-receiver.yaml @@ -38,8 +38,7 @@ spec: kubernetes.io/os: linux containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml image: quay.io/signalfx/splunk-otel-collector:0.122.0 imagePullPolicy: IfNotPresent diff --git a/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml b/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml index ca19d3a64d..d2048133a6 100644 --- a/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml +++ b/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml @@ -124,8 +124,7 @@ spec: - name: tmp mountPath: /tmp - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml ports: - name: fluentforward diff --git a/examples/only-logs-otel/rendered_manifests/daemonset.yaml b/examples/only-logs-otel/rendered_manifests/daemonset.yaml index 9a19b97557..9a5ecf09d1 100644 --- a/examples/only-logs-otel/rendered_manifests/daemonset.yaml +++ b/examples/only-logs-otel/rendered_manifests/daemonset.yaml @@ -56,8 +56,7 @@ spec: initContainers: containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml ports: - name: fluentforward diff --git a/examples/only-logs-with-extra-file-logs/rendered_manifests/daemonset.yaml b/examples/only-logs-with-extra-file-logs/rendered_manifests/daemonset.yaml index 3dbffb773f..fd75c5ce01 100644 --- a/examples/only-logs-with-extra-file-logs/rendered_manifests/daemonset.yaml +++ b/examples/only-logs-with-extra-file-logs/rendered_manifests/daemonset.yaml @@ -56,8 +56,7 @@ spec: initContainers: containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml ports: - name: fluentforward diff --git a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml index 84fba31587..27d3146271 100644 --- a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml +++ b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml @@ -55,8 +55,7 @@ spec: operator: Exists containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml ports: - name: otlp diff --git a/examples/only-metrics-platform/rendered_manifests/deployment-cluster-receiver.yaml b/examples/only-metrics-platform/rendered_manifests/deployment-cluster-receiver.yaml index 55c86d88de..a370fc9309 100644 --- a/examples/only-metrics-platform/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/only-metrics-platform/rendered_manifests/deployment-cluster-receiver.yaml @@ -38,8 +38,7 @@ spec: kubernetes.io/os: linux containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml image: quay.io/signalfx/splunk-otel-collector:0.122.0 imagePullPolicy: IfNotPresent diff --git a/examples/only-metrics/rendered_manifests/daemonset.yaml b/examples/only-metrics/rendered_manifests/daemonset.yaml index 0208b54902..368d2049b6 100644 --- a/examples/only-metrics/rendered_manifests/daemonset.yaml +++ b/examples/only-metrics/rendered_manifests/daemonset.yaml @@ -55,8 +55,7 @@ spec: operator: Exists containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml ports: - name: otlp diff --git a/examples/only-metrics/rendered_manifests/deployment-cluster-receiver.yaml b/examples/only-metrics/rendered_manifests/deployment-cluster-receiver.yaml index a13f79c68f..440ca52b6d 100644 --- a/examples/only-metrics/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/only-metrics/rendered_manifests/deployment-cluster-receiver.yaml @@ -38,8 +38,7 @@ spec: kubernetes.io/os: linux containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml image: quay.io/signalfx/splunk-otel-collector:0.122.0 imagePullPolicy: IfNotPresent diff --git a/examples/only-traces/rendered_manifests/daemonset.yaml b/examples/only-traces/rendered_manifests/daemonset.yaml index 9152f2021e..5eb54071e2 100644 --- a/examples/only-traces/rendered_manifests/daemonset.yaml +++ b/examples/only-traces/rendered_manifests/daemonset.yaml @@ -55,8 +55,7 @@ spec: operator: Exists containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml ports: - name: jaeger-grpc diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml index 79dc12f4c8..0727feefea 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml @@ -55,8 +55,7 @@ spec: operator: Exists containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml ports: - name: jaeger-grpc diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/deployment-cluster-receiver.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/deployment-cluster-receiver.yaml index a0b5ded3a8..0dcc523ba0 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/deployment-cluster-receiver.yaml @@ -38,8 +38,7 @@ spec: kubernetes.io/os: linux containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml image: quay.io/signalfx/splunk-otel-collector:0.122.0 imagePullPolicy: IfNotPresent diff --git a/examples/secret-validation/rendered_manifests/daemonset.yaml b/examples/secret-validation/rendered_manifests/daemonset.yaml index d578e9d3ca..3b11399d0c 100644 --- a/examples/secret-validation/rendered_manifests/daemonset.yaml +++ b/examples/secret-validation/rendered_manifests/daemonset.yaml @@ -56,8 +56,7 @@ spec: initContainers: containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml ports: - name: fluentforward diff --git a/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml b/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml index 131ed0d293..03d493ec44 100644 --- a/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml +++ b/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml @@ -56,8 +56,7 @@ spec: initContainers: containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml ports: - name: fluentforward diff --git a/examples/target-allocator/rendered_manifests/daemonset.yaml b/examples/target-allocator/rendered_manifests/daemonset.yaml index b81f7c2639..ae9f02be72 100644 --- a/examples/target-allocator/rendered_manifests/daemonset.yaml +++ b/examples/target-allocator/rendered_manifests/daemonset.yaml @@ -55,8 +55,7 @@ spec: operator: Exists containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml ports: - name: jaeger-grpc diff --git a/examples/target-allocator/rendered_manifests/deployment-cluster-receiver.yaml b/examples/target-allocator/rendered_manifests/deployment-cluster-receiver.yaml index a13f79c68f..440ca52b6d 100644 --- a/examples/target-allocator/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/target-allocator/rendered_manifests/deployment-cluster-receiver.yaml @@ -38,8 +38,7 @@ spec: kubernetes.io/os: linux containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml image: quay.io/signalfx/splunk-otel-collector:0.122.0 imagePullPolicy: IfNotPresent diff --git a/examples/use-proxy/rendered_manifests/daemonset.yaml b/examples/use-proxy/rendered_manifests/daemonset.yaml index a4efa6e050..43a5ddf63e 100644 --- a/examples/use-proxy/rendered_manifests/daemonset.yaml +++ b/examples/use-proxy/rendered_manifests/daemonset.yaml @@ -55,8 +55,7 @@ spec: operator: Exists containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml ports: - name: jaeger-grpc diff --git a/examples/use-proxy/rendered_manifests/deployment-cluster-receiver.yaml b/examples/use-proxy/rendered_manifests/deployment-cluster-receiver.yaml index 18b305819c..9b357c220e 100644 --- a/examples/use-proxy/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/use-proxy/rendered_manifests/deployment-cluster-receiver.yaml @@ -38,8 +38,7 @@ spec: kubernetes.io/os: linux containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml image: quay.io/signalfx/splunk-otel-collector:0.122.0 imagePullPolicy: IfNotPresent diff --git a/examples/with-target-allocator/rendered_manifests/daemonset.yaml b/examples/with-target-allocator/rendered_manifests/daemonset.yaml index b0d6f6046a..13865d9ef5 100644 --- a/examples/with-target-allocator/rendered_manifests/daemonset.yaml +++ b/examples/with-target-allocator/rendered_manifests/daemonset.yaml @@ -55,8 +55,7 @@ spec: operator: Exists containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml ports: - name: jaeger-grpc diff --git a/examples/with-target-allocator/rendered_manifests/deployment-cluster-receiver.yaml b/examples/with-target-allocator/rendered_manifests/deployment-cluster-receiver.yaml index a13f79c68f..440ca52b6d 100644 --- a/examples/with-target-allocator/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/with-target-allocator/rendered_manifests/deployment-cluster-receiver.yaml @@ -38,8 +38,7 @@ spec: kubernetes.io/os: linux containers: - name: otel-collector - command: - - /otelcol + args: - --config=/conf/relay.yaml image: quay.io/signalfx/splunk-otel-collector:0.122.0 imagePullPolicy: IfNotPresent diff --git a/helm-charts/splunk-otel-collector/templates/daemonset.yaml b/helm-charts/splunk-otel-collector/templates/daemonset.yaml index 26592d124f..82fb92eef6 100644 --- a/helm-charts/splunk-otel-collector/templates/daemonset.yaml +++ b/helm-charts/splunk-otel-collector/templates/daemonset.yaml @@ -243,14 +243,15 @@ spec: mountPath: /tmp {{- end }} - name: otel-collector + {{- if (eq .Values.distribution "gke/autopilot") }} command: + - /otelcol + {{- else }} + args: + {{- end }} {{- if .Values.isWindows }} - - powershell.exe - - -command - - .\otelcol.exe - --config=C:\\conf\relay.yaml {{- else }} - - /otelcol - --config=/conf/relay.yaml {{- end }} {{- if .Values.agent.featureGates }} diff --git a/helm-charts/splunk-otel-collector/templates/deployment-cluster-receiver.yaml b/helm-charts/splunk-otel-collector/templates/deployment-cluster-receiver.yaml index f61d069b8a..e182a770ac 100644 --- a/helm-charts/splunk-otel-collector/templates/deployment-cluster-receiver.yaml +++ b/helm-charts/splunk-otel-collector/templates/deployment-cluster-receiver.yaml @@ -111,20 +111,14 @@ spec: {{- end }} containers: - name: otel-collector - command: + args: {{- if .Values.isWindows }} - - powershell.exe - - -command - - .\otelcol.exe - --config=C:\\conf\relay.yaml - {{- else }} - - /otelcol - {{- if eq (include "splunk-otel-collector.distribution" .) "eks/fargate" }} + {{- else if eq (include "splunk-otel-collector.distribution" .) "eks/fargate" }} - --config=/splunk-messages/config.yaml {{- else }} - --config=/conf/relay.yaml {{- end }} - {{- end }} {{- if .Values.clusterReceiver.featureGates }} - --feature-gates={{ .Values.clusterReceiver.featureGates }} {{- end }} diff --git a/helm-charts/splunk-otel-collector/templates/deployment-gateway.yaml b/helm-charts/splunk-otel-collector/templates/deployment-gateway.yaml index be521d46dd..7003fe11d3 100644 --- a/helm-charts/splunk-otel-collector/templates/deployment-gateway.yaml +++ b/helm-charts/splunk-otel-collector/templates/deployment-gateway.yaml @@ -68,14 +68,10 @@ spec: {{- end }} containers: - name: otel-collector - command: + args: {{- if .Values.isWindows }} - - powershell.exe - - -command - - .\otelcol.exe - --config=C:\\conf\relay.yaml {{- else }} - - /otelcol - --config=/conf/relay.yaml {{- end }} {{- if .Values.gateway.featureGates }}