Skip to content

Commit aa17424

Browse files
fix(target-allocator): use Downward API for OTELCOL_NAMESPACE so namespaceOverride works (#2218)
The TA pod's OTELCOL_NAMESPACE env was templated from .Release.Namespace (or the optional collector_namespace value). When the chart is installed into a different namespace via namespaceOverride, every other resource lands in the override namespace, but the pod is told to watch .Release.Namespace, so the collector watcher returns zero pods and the allocator never assigns targets. Source the value from the Downward API (metadata.namespace) so the pod always sees its own namespace regardless of how the chart was installed (helm install, subchart, helm template | kustomize, plain kubectl apply, ArgoCD with destination override). This matches what the operator's TA reconciler and the standalone manifest in opentelemetry-operator already use. The targetAllocator.config.collector_namespace value is preserved as an explicit override that wins over the fieldRef, so deployments that intentionally watch a different namespace from their own are unaffected. Bump chart to 0.128.1 and regenerate examples.
1 parent b8eaf5e commit aa17424

32 files changed

Lines changed: 65 additions & 49 deletions

charts/opentelemetry-target-allocator/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-target-allocator
3-
version: 0.128.0
3+
version: 0.128.1
44
description: OpenTelemetry Target Allocator Helm chart for Kubernetes
55
type: application
66
home: https://opentelemetry.io/

charts/opentelemetry-target-allocator/examples/collector-fleet/rendered/clusterRole.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
namespace: default
77
name: example-opentelemetry-target-allocator-ta-clusterRole
88
labels:
9-
helm.sh/chart: opentelemetry-target-allocator-0.151.0
9+
helm.sh/chart: opentelemetry-target-allocator-0.128.1
1010
app.kubernetes.io/managed-by: Helm
1111
app.kubernetes.io/part-of: opentelemetry-target-allocator
1212
app.kubernetes.io/version: "0.151.0"

charts/opentelemetry-target-allocator/examples/collector-fleet/rendered/clusterRoleBinding.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ apiVersion: rbac.authorization.k8s.io/v1
55
metadata:
66
name: example-opentelemetry-target-allocator-ta-clusterRoleBinding
77
labels:
8-
helm.sh/chart: opentelemetry-target-allocator-0.151.0
8+
helm.sh/chart: opentelemetry-target-allocator-0.128.1
99
app.kubernetes.io/managed-by: Helm
1010
app.kubernetes.io/part-of: opentelemetry-target-allocator
1111
app.kubernetes.io/version: "0.151.0"

charts/opentelemetry-target-allocator/examples/collector-fleet/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-target-allocator-ta-configmap
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-target-allocator-0.151.0
9+
helm.sh/chart: opentelemetry-target-allocator-0.128.1
1010
app.kubernetes.io/managed-by: Helm
1111
app.kubernetes.io/part-of: opentelemetry-target-allocator
1212
app.kubernetes.io/version: "0.151.0"

charts/opentelemetry-target-allocator/examples/collector-fleet/rendered/deployment.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
namespace: default
77
name: example-opentelemetry-target-allocator-ta
88
labels:
9-
helm.sh/chart: opentelemetry-target-allocator-0.151.0
9+
helm.sh/chart: opentelemetry-target-allocator-0.128.1
1010
app.kubernetes.io/managed-by: Helm
1111
app.kubernetes.io/part-of: opentelemetry-target-allocator
1212
app.kubernetes.io/version: "0.151.0"
@@ -21,9 +21,9 @@ spec:
2121
template:
2222
metadata:
2323
annotations:
24-
checksum/config: ca42eb9ade6782b3d97ee14bb416001699f2fc9df0fe7011f079ee92f49a20ac
24+
checksum/config: e37d0d540bfe4adb49aa51d7b7d4c5c028e1480520238a474d7a0afb3c18e874
2525
labels:
26-
helm.sh/chart: opentelemetry-target-allocator-0.151.0
26+
helm.sh/chart: opentelemetry-target-allocator-0.128.1
2727
app.kubernetes.io/managed-by: Helm
2828
app.kubernetes.io/part-of: opentelemetry-target-allocator
2929
app.kubernetes.io/version: "0.151.0"

charts/opentelemetry-target-allocator/examples/collector-fleet/rendered/serviceAccount.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
name: example-opentelemetry-target-allocator-ta
88
namespace: default
99
labels:
10-
helm.sh/chart: opentelemetry-target-allocator-0.151.0
10+
helm.sh/chart: opentelemetry-target-allocator-0.128.1
1111
app.kubernetes.io/managed-by: Helm
1212
app.kubernetes.io/part-of: opentelemetry-target-allocator
1313
app.kubernetes.io/version: "0.151.0"

charts/opentelemetry-target-allocator/examples/consistent-hashing/rendered/clusterRole.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
namespace: default
77
name: example-opentelemetry-target-allocator-ta-clusterRole
88
labels:
9-
helm.sh/chart: opentelemetry-target-allocator-0.151.0
9+
helm.sh/chart: opentelemetry-target-allocator-0.128.1
1010
app.kubernetes.io/managed-by: Helm
1111
app.kubernetes.io/part-of: opentelemetry-target-allocator
1212
app.kubernetes.io/version: "0.151.0"

charts/opentelemetry-target-allocator/examples/consistent-hashing/rendered/clusterRoleBinding.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ apiVersion: rbac.authorization.k8s.io/v1
55
metadata:
66
name: example-opentelemetry-target-allocator-ta-clusterRoleBinding
77
labels:
8-
helm.sh/chart: opentelemetry-target-allocator-0.151.0
8+
helm.sh/chart: opentelemetry-target-allocator-0.128.1
99
app.kubernetes.io/managed-by: Helm
1010
app.kubernetes.io/part-of: opentelemetry-target-allocator
1111
app.kubernetes.io/version: "0.151.0"

charts/opentelemetry-target-allocator/examples/consistent-hashing/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-target-allocator-ta-configmap
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-target-allocator-0.151.0
9+
helm.sh/chart: opentelemetry-target-allocator-0.128.1
1010
app.kubernetes.io/managed-by: Helm
1111
app.kubernetes.io/part-of: opentelemetry-target-allocator
1212
app.kubernetes.io/version: "0.151.0"

charts/opentelemetry-target-allocator/examples/consistent-hashing/rendered/deployment.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
namespace: default
77
name: example-opentelemetry-target-allocator-ta
88
labels:
9-
helm.sh/chart: opentelemetry-target-allocator-0.151.0
9+
helm.sh/chart: opentelemetry-target-allocator-0.128.1
1010
app.kubernetes.io/managed-by: Helm
1111
app.kubernetes.io/part-of: opentelemetry-target-allocator
1212
app.kubernetes.io/version: "0.151.0"
@@ -21,9 +21,9 @@ spec:
2121
template:
2222
metadata:
2323
annotations:
24-
checksum/config: 9ff48203ed298ab5d9f8e4fc7724236d2b89b2445b3b05759f15588cd745af51
24+
checksum/config: ca96982a57560c47f4f5666899beba95eabf7a0dfa218d4e7d7ea53586813531
2525
labels:
26-
helm.sh/chart: opentelemetry-target-allocator-0.151.0
26+
helm.sh/chart: opentelemetry-target-allocator-0.128.1
2727
app.kubernetes.io/managed-by: Helm
2828
app.kubernetes.io/part-of: opentelemetry-target-allocator
2929
app.kubernetes.io/version: "0.151.0"
@@ -46,7 +46,9 @@ spec:
4646
readOnly: true
4747
env: # Workaround for https://github.com/open-telemetry/opentelemetry-operator/pull/3976
4848
- name: OTELCOL_NAMESPACE
49-
value: default
49+
valueFrom:
50+
fieldRef:
51+
fieldPath: metadata.namespace
5052
livenessProbe:
5153
httpGet:
5254
path: /livez

0 commit comments

Comments
 (0)