Skip to content

Commit 1866d84

Browse files
committed
fix(collector): command helper fixed for the supervisor preset
1 parent 9024f03 commit 1866d84

5 files changed

Lines changed: 8 additions & 6 deletions

File tree

charts/opentelemetry-collector/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
## OpenTelemetry Collector
44

5+
## v0.115.29 / 2025-06-13
6+
- [Fix] Fix `command` template helper when using the Supervisor preset.
57
## v0.115.28 / 2025-06-12
68
- [Fix] Fix `image` template helper when using the Supervisor preset and when using the Collector CRDs.
79
## v0.115.27 / 2025-06-11

charts/opentelemetry-collector/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: opentelemetry-collector
3-
version: 0.115.28
3+
version: 0.115.29
44
description: OpenTelemetry Collector Helm chart for Kubernetes
55
type: application
66
home: https://opentelemetry.io/

charts/opentelemetry-collector/examples/daemonset-supervisor/values.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ global:
88
image:
99
tag: 0.128.0
1010

11-
command:
12-
name: opampsupervisor
13-
1411
mode: daemonset
1512
extraVolumes:
1613
- name: etcmachineid

charts/opentelemetry-collector/templates/_custom_helpers.tpl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,16 @@ Determine the container image to use based on presets and user overrides.
6161
Determine the command to use based on platform and configuration.
6262
*/}}
6363
{{- define "opentelemetry-collector.command" -}}
64-
{{- $executable := printf "/%s" .Values.command.name -}}
64+
{{- $executable := "/otelcol-contrib" -}}
6565
{{- $configPath := "/conf/relay.yaml" -}}
6666
{{- $configArg := "" -}}
6767
{{- /* Step 1: If on Windows, the executable path is different */ -}}
6868
{{- if .Values.isWindows -}}
6969
{{- $executable = "C:\\otelcol-contrib.exe" | quote -}}
7070
{{- end -}}
71+
{{- if (and (.Values.presets.fleetManagement.enabled) (.Values.presets.fleetManagement.supervisor.enabled)) -}}
72+
{{- $executable = "/opampsupervisor" }}
73+
{{- end -}}
7174
{{- /* Step 2: Determine config path and argument based on configuration */ -}}
7275
{{- if .Values.configMap.create -}}
7376
{{- if .Values.isWindows -}}

charts/opentelemetry-collector/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ imagePullSecrets: []
534534

535535
# OpenTelemetry Collector executable
536536
command:
537-
name: otelcol-contrib
537+
name: ""
538538
extraArgs: []
539539

540540
serviceAccount:

0 commit comments

Comments
 (0)