Skip to content

Commit 52a9ce5

Browse files
[collector][supervisor] Fix custom image helper (#218)
Fixes ES-629. This PR fixes an issue in the image helper. Before we had the default Collector image hardcoded in values so it would always be picked even when the Supervisor preset was enabled. Now by default there is no image hardcoded in the values. This allows the helper logic to work correctly: If an image is given via values, no matter the circusmtances, always use it. If no image is given via values and Supervisor preset is disabled: use the hardcoded default one. If no image is given via values and Supervisor preset is enabled: use the custom supervised collector image. Unfortunately this bug happened because I was using a custom image repository during my tests without realizing.
1 parent 8699fc0 commit 52a9ce5

125 files changed

Lines changed: 153 additions & 158 deletions

File tree

Some content is hidden

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

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.27 / 2025-06-11
6+
- [Fix] Fix `image` template helper when using the Supervisor preset and when using the Collector CRDs.
57
## v0.115.26 / 2025-06-11
68
- [Feat] Add an alpha `supervisor` preset under the `fleetManagement` preset
79
- [Feat] Certain attributes related to the `fleetManagement` preset are now added

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.27
3+
version: 0.115.28
44
description: OpenTelemetry Collector Helm chart for Kubernetes
55
type: application
66
home: https://opentelemetry.io/

charts/opentelemetry-collector/examples/coralogix-exporter/rendered/configmap-agent.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector-agent
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.115.27
9+
helm.sh/chart: opentelemetry-collector-0.115.28
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.126.0"

charts/opentelemetry-collector/examples/coralogix-exporter/rendered/daemonset.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector-agent
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.115.27
9+
helm.sh/chart: opentelemetry-collector-0.115.28
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.126.0"
@@ -23,7 +23,7 @@ spec:
2323
template:
2424
metadata:
2525
annotations:
26-
checksum/config: 07309c6205c5b0bd70d78884041fe64a629f4bc971f062705c0604de85cfbc7e
26+
checksum/config: 7b5633295a12c66292289779e60ad6fe0d751e7f85b77977bf198ee49468fb18
2727

2828
labels:
2929
app.kubernetes.io/name: opentelemetry-collector

charts/opentelemetry-collector/examples/coralogix-exporter/rendered/serviceaccount.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.115.27
9+
helm.sh/chart: opentelemetry-collector-0.115.28
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.126.0"

charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/clusterrole.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: ClusterRole
55
metadata:
66
name: example-opentelemetry-collector
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.115.27
8+
helm.sh/chart: opentelemetry-collector-0.115.28
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.126.0"

charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/clusterrolebinding.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: ClusterRoleBinding
55
metadata:
66
name: example-opentelemetry-collector
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.115.27
8+
helm.sh/chart: opentelemetry-collector-0.115.28
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.126.0"

charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector-agent
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.115.27
9+
helm.sh/chart: opentelemetry-collector-0.115.28
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.126.0"

charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.115.27
9+
helm.sh/chart: opentelemetry-collector-0.115.28
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.126.0"

charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector-agent
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.115.27
9+
helm.sh/chart: opentelemetry-collector-0.115.28
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.126.0"
@@ -23,7 +23,7 @@ spec:
2323
template:
2424
metadata:
2525
annotations:
26-
checksum/config: c4c8dde5819cc8a946f28af07555435e0f4361794436e978760125df6c6577cc
26+
checksum/config: 5c35bfd541d02d03aa5da21fb3ce19169d0ede41f8f9f1ded4abc50379860151
2727

2828
labels:
2929
app.kubernetes.io/name: opentelemetry-collector

0 commit comments

Comments
 (0)