Skip to content

Commit c3a2601

Browse files
committed
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.
1 parent 301f652 commit c3a2601

File tree

74 files changed

+86
-160
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+86
-160
lines changed

.chloggen/dont-hardcode-command.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2+
change_type: enhancement
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: all
5+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
6+
note: Don't hardcode the command in the pod specs
7+
# One or more tracking issues related to the change
8+
issues: [1758]

examples/add-filter-processor/rendered_manifests/daemonset.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ spec:
5656
initContainers:
5757
containers:
5858
- name: otel-collector
59-
command:
60-
- /otelcol
59+
args:
6160
- --config=/conf/relay.yaml
6261
ports:
6362
- name: fluentforward

examples/add-filter-processor/rendered_manifests/deployment-cluster-receiver.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ spec:
3838
kubernetes.io/os: linux
3939
containers:
4040
- name: otel-collector
41-
command:
42-
- /otelcol
41+
args:
4342
- --config=/conf/relay.yaml
4443
image: quay.io/signalfx/splunk-otel-collector:0.122.0
4544
imagePullPolicy: IfNotPresent

examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ spec:
5656
initContainers:
5757
containers:
5858
- name: otel-collector
59-
command:
60-
- /otelcol
59+
args:
6160
- --config=/conf/relay.yaml
6261
ports:
6362
- name: fluentforward

examples/add-kafkametrics-receiver/rendered_manifests/deployment-cluster-receiver.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ spec:
3838
kubernetes.io/os: linux
3939
containers:
4040
- name: otel-collector
41-
command:
42-
- /otelcol
41+
args:
4342
- --config=/conf/relay.yaml
4443
image: quay.io/signalfx/splunk-otel-collector:0.122.0
4544
imagePullPolicy: IfNotPresent

examples/add-receiver-creator/rendered_manifests/daemonset.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ spec:
5555
operator: Exists
5656
containers:
5757
- name: otel-collector
58-
command:
59-
- /otelcol
58+
args:
6059
- --config=/conf/relay.yaml
6160
ports:
6261
- name: jaeger-grpc

examples/add-receiver-creator/rendered_manifests/deployment-cluster-receiver.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ spec:
3838
kubernetes.io/os: linux
3939
containers:
4040
- name: otel-collector
41-
command:
42-
- /otelcol
41+
args:
4342
- --config=/conf/relay.yaml
4443
image: quay.io/signalfx/splunk-otel-collector:0.122.0
4544
imagePullPolicy: IfNotPresent

examples/add-sampler/rendered_manifests/daemonset.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ spec:
5555
operator: Exists
5656
containers:
5757
- name: otel-collector
58-
command:
59-
- /otelcol
58+
args:
6059
- --config=/conf/relay.yaml
6160
ports:
6261
- name: jaeger-grpc

examples/add-sampler/rendered_manifests/deployment-cluster-receiver.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ spec:
3838
kubernetes.io/os: linux
3939
containers:
4040
- name: otel-collector
41-
command:
42-
- /otelcol
41+
args:
4342
- --config=/conf/relay.yaml
4443
image: quay.io/signalfx/splunk-otel-collector:0.122.0
4544
imagePullPolicy: IfNotPresent

examples/autodetect-istio/rendered_manifests/daemonset.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ spec:
5757
initContainers:
5858
containers:
5959
- name: otel-collector
60-
command:
61-
- /otelcol
60+
args:
6261
- --config=/conf/relay.yaml
6362
ports:
6463
- name: fluentforward

examples/autodetect-istio/rendered_manifests/deployment-cluster-receiver.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ spec:
3939
kubernetes.io/os: linux
4040
containers:
4141
- name: otel-collector
42-
command:
43-
- /otelcol
42+
args:
4443
- --config=/conf/relay.yaml
4544
image: quay.io/signalfx/splunk-otel-collector:0.122.0
4645
imagePullPolicy: IfNotPresent

examples/collector-agent-only/rendered_manifests/daemonset.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ spec:
5555
operator: Exists
5656
containers:
5757
- name: otel-collector
58-
command:
59-
- /otelcol
58+
args:
6059
- --config=/conf/relay.yaml
6160
ports:
6261
- name: jaeger-grpc

examples/collector-all-modes/rendered_manifests/daemonset.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ spec:
5555
operator: Exists
5656
containers:
5757
- name: otel-collector
58-
command:
59-
- /otelcol
58+
args:
6059
- --config=/conf/relay.yaml
6160
ports:
6261
- name: jaeger-grpc

examples/collector-all-modes/rendered_manifests/deployment-cluster-receiver.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ spec:
3838
kubernetes.io/os: linux
3939
containers:
4040
- name: otel-collector
41-
command:
42-
- /otelcol
41+
args:
4342
- --config=/conf/relay.yaml
4443
image: quay.io/signalfx/splunk-otel-collector:0.122.0
4544
imagePullPolicy: IfNotPresent

examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ spec:
3838
kubernetes.io/os: linux
3939
containers:
4040
- name: otel-collector
41-
command:
42-
- /otelcol
41+
args:
4342
- --config=/conf/relay.yaml
4443
image: quay.io/signalfx/splunk-otel-collector:0.122.0
4544
imagePullPolicy: IfNotPresent

examples/collector-cluster-receiver-only/rendered_manifests/deployment-cluster-receiver.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ spec:
3838
kubernetes.io/os: linux
3939
containers:
4040
- name: otel-collector
41-
command:
42-
- /otelcol
41+
args:
4342
- --config=/conf/relay.yaml
4443
image: quay.io/signalfx/splunk-otel-collector:0.122.0
4544
imagePullPolicy: IfNotPresent

examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ spec:
3838
kubernetes.io/os: linux
3939
containers:
4040
- name: otel-collector
41-
command:
42-
- /otelcol
41+
args:
4342
- --config=/conf/relay.yaml
4443
image: quay.io/signalfx/splunk-otel-collector:0.122.0
4544
imagePullPolicy: IfNotPresent

examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ spec:
5555
operator: Exists
5656
containers:
5757
- name: otel-collector
58-
command:
59-
- /otelcol
58+
args:
6059
- --config=/conf/relay.yaml
6160
ports:
6261
- name: jaeger-grpc

examples/controlplane-histogram-metrics/rendered_manifests/deployment-cluster-receiver.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ spec:
3838
kubernetes.io/os: linux
3939
containers:
4040
- name: otel-collector
41-
command:
42-
- /otelcol
41+
args:
4342
- --config=/conf/relay.yaml
4443
image: quay.io/signalfx/splunk-otel-collector:0.122.0
4544
imagePullPolicy: IfNotPresent

examples/crio-logging/rendered_manifests/daemonset.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ spec:
5555
operator: Exists
5656
containers:
5757
- name: otel-collector
58-
command:
59-
- /otelcol
58+
args:
6059
- --config=/conf/relay.yaml
6160
ports:
6261
- name: jaeger-grpc

examples/crio-logging/rendered_manifests/deployment-cluster-receiver.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ spec:
3838
kubernetes.io/os: linux
3939
containers:
4040
- name: otel-collector
41-
command:
42-
- /otelcol
41+
args:
4342
- --config=/conf/relay.yaml
4443
image: quay.io/signalfx/splunk-otel-collector:0.122.0
4544
imagePullPolicy: IfNotPresent

examples/default/rendered_manifests/daemonset.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ spec:
5555
operator: Exists
5656
containers:
5757
- name: otel-collector
58-
command:
59-
- /otelcol
58+
args:
6059
- --config=/conf/relay.yaml
6160
ports:
6261
- name: jaeger-grpc

examples/default/rendered_manifests/deployment-cluster-receiver.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ spec:
3838
kubernetes.io/os: linux
3939
containers:
4040
- name: otel-collector
41-
command:
42-
- /otelcol
41+
args:
4342
- --config=/conf/relay.yaml
4443
image: quay.io/signalfx/splunk-otel-collector:0.122.0
4544
imagePullPolicy: IfNotPresent

examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ spec:
5656
initContainers:
5757
containers:
5858
- name: otel-collector
59-
command:
60-
- /otelcol
59+
args:
6160
- --config=/conf/relay.yaml
6261
ports:
6362
- name: fluentforward

examples/disable-persistence-queue-traces/rendered_manifests/deployment-cluster-receiver.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ spec:
3838
kubernetes.io/os: linux
3939
containers:
4040
- name: otel-collector
41-
command:
42-
- /otelcol
41+
args:
4342
- --config=/conf/relay.yaml
4443
image: quay.io/signalfx/splunk-otel-collector:0.122.0
4544
imagePullPolicy: IfNotPresent

examples/discovery-mode/rendered_manifests/daemonset.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ spec:
5555
operator: Exists
5656
containers:
5757
- name: otel-collector
58-
command:
59-
- /otelcol
58+
args:
6059
- --config=/conf/relay.yaml
6160
- --discovery
6261
ports:

examples/distribution-aks/rendered_manifests/daemonset.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ spec:
5555
operator: Exists
5656
containers:
5757
- name: otel-collector
58-
command:
59-
- /otelcol
58+
args:
6059
- --config=/conf/relay.yaml
6160
ports:
6261
- name: jaeger-grpc

examples/distribution-aks/rendered_manifests/deployment-cluster-receiver.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ spec:
3838
kubernetes.io/os: linux
3939
containers:
4040
- name: otel-collector
41-
command:
42-
- /otelcol
41+
args:
4342
- --config=/conf/relay.yaml
4443
image: quay.io/signalfx/splunk-otel-collector:0.122.0
4544
imagePullPolicy: IfNotPresent

examples/distribution-eks-fargate/rendered_manifests/deployment-cluster-receiver.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@ spec:
7171
name: collector-configmap
7272
containers:
7373
- name: otel-collector
74-
command:
75-
- /otelcol
74+
args:
7675
- --config=/splunk-messages/config.yaml
7776
image: quay.io/signalfx/splunk-otel-collector:0.122.0
7877
imagePullPolicy: IfNotPresent

examples/distribution-eks-fargate/rendered_manifests/deployment-gateway.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ spec:
3838
kubernetes.io/os: linux
3939
containers:
4040
- name: otel-collector
41-
command:
42-
- /otelcol
41+
args:
4342
- --config=/conf/relay.yaml
4443
image: quay.io/signalfx/splunk-otel-collector:0.122.0
4544
imagePullPolicy: IfNotPresent

examples/distribution-eks/rendered_manifests/daemonset.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ spec:
5555
operator: Exists
5656
containers:
5757
- name: otel-collector
58-
command:
59-
- /otelcol
58+
args:
6059
- --config=/conf/relay.yaml
6160
ports:
6261
- name: jaeger-grpc

examples/distribution-eks/rendered_manifests/deployment-cluster-receiver.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ spec:
3838
kubernetes.io/os: linux
3939
containers:
4040
- name: otel-collector
41-
command:
42-
- /otelcol
41+
args:
4342
- --config=/conf/relay.yaml
4443
image: quay.io/signalfx/splunk-otel-collector:0.122.0
4544
imagePullPolicy: IfNotPresent

examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ spec:
5656
containers:
5757
- name: otel-collector
5858
command:
59-
- /otelcol
59+
- "/otelcol"
6060
- --config=/conf/relay.yaml
6161
ports:
6262
- name: jaeger-grpc

examples/distribution-gke-autopilot/rendered_manifests/deployment-cluster-receiver.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ spec:
3838
kubernetes.io/os: linux
3939
containers:
4040
- name: otel-collector
41-
command:
42-
- /otelcol
41+
args:
4342
- --config=/conf/relay.yaml
4443
image: quay.io/signalfx/splunk-otel-collector:0.122.0
4544
imagePullPolicy: IfNotPresent

examples/distribution-gke/rendered_manifests/daemonset.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ spec:
5555
operator: Exists
5656
containers:
5757
- name: otel-collector
58-
command:
59-
- /otelcol
58+
args:
6059
- --config=/conf/relay.yaml
6160
ports:
6261
- name: jaeger-grpc

examples/distribution-gke/rendered_manifests/deployment-cluster-receiver.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ spec:
3838
kubernetes.io/os: linux
3939
containers:
4040
- name: otel-collector
41-
command:
42-
- /otelcol
41+
args:
4342
- --config=/conf/relay.yaml
4443
image: quay.io/signalfx/splunk-otel-collector:0.122.0
4544
imagePullPolicy: IfNotPresent

examples/distribution-openshift/rendered_manifests/daemonset.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ spec:
5555
operator: Exists
5656
containers:
5757
- name: otel-collector
58-
command:
59-
- /otelcol
58+
args:
6059
- --config=/conf/relay.yaml
6160
ports:
6261
- name: jaeger-grpc

examples/distribution-openshift/rendered_manifests/deployment-cluster-receiver.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ spec:
3838
kubernetes.io/os: linux
3939
containers:
4040
- name: otel-collector
41-
command:
42-
- /otelcol
41+
args:
4342
- --config=/conf/relay.yaml
4443
image: quay.io/signalfx/splunk-otel-collector:0.122.0
4544
imagePullPolicy: IfNotPresent

examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ spec:
5656
initContainers:
5757
containers:
5858
- name: otel-collector
59-
command:
60-
- /otelcol
59+
args:
6160
- --config=/conf/relay.yaml
6261
ports:
6362
- name: fluentforward

examples/enable-operator-and-auto-instrumentation/rendered_manifests/deployment-cluster-receiver.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ spec:
3838
kubernetes.io/os: linux
3939
containers:
4040
- name: otel-collector
41-
command:
42-
- /otelcol
41+
args:
4342
- --config=/conf/relay.yaml
4443
image: quay.io/signalfx/splunk-otel-collector:0.122.0
4544
imagePullPolicy: IfNotPresent

0 commit comments

Comments
 (0)