Skip to content

Commit 4c6e67e

Browse files
authored
[opentelemetry-kube-stack] fix filters on k8sAttributes config (#1549)
* change k8sattribtues filter's node_env_var * bump chart version * bump chart version due to version conflict
1 parent 4fe681a commit 4c6e67e

File tree

19 files changed

+21
-21
lines changed

19 files changed

+21
-21
lines changed

charts/opentelemetry-kube-stack/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: opentelemetry-kube-stack
3-
version: 0.4.2
3+
version: 0.4.3
44
description: |
55
OpenTelemetry Quickstart chart for Kubernetes.
66
Installs an operator and collector for an easy way to get started with Kubernetes observability.

charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/bridge.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: OpAMPBridge
55
metadata:
66
name: example
77
labels:
8-
helm.sh/chart: opentelemetry-kube-stack-0.4.2
8+
helm.sh/chart: opentelemetry-kube-stack-0.4.3
99
app.kubernetes.io/version: "0.117.0"
1010
app.kubernetes.io/managed-by: Helm
1111
release: "example"

charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/collector.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-cluster-stats
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-kube-stack-0.4.2
9+
helm.sh/chart: opentelemetry-kube-stack-0.4.3
1010
app.kubernetes.io/version: "0.117.0"
1111
app.kubernetes.io/managed-by: Helm
1212
release: "example"
@@ -187,7 +187,7 @@ metadata:
187187
name: example-daemon
188188
namespace: default
189189
labels:
190-
helm.sh/chart: opentelemetry-kube-stack-0.4.2
190+
helm.sh/chart: opentelemetry-kube-stack-0.4.3
191191
app.kubernetes.io/version: "0.117.0"
192192
app.kubernetes.io/managed-by: Helm
193193
release: "example"
@@ -246,7 +246,7 @@ spec:
246246
- container.image.name
247247
- k8s.cluster.uid
248248
filter:
249-
node_from_env_var: K8S_NODE_NAME
249+
node_from_env_var: OTEL_K8S_NODE_NAME
250250
passthrough: false
251251
pod_association:
252252
- sources:

charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/hooks.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,4 @@ spec:
6262
- -c
6363
- |
6464
kubectl delete instrumentations,opampbridges,opentelemetrycollectors \
65-
-l helm.sh/chart=opentelemetry-kube-stack-0.4.2
65+
-l helm.sh/chart=opentelemetry-kube-stack-0.4.3

charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/instrumentation.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: Instrumentation
55
metadata:
66
name: example
77
labels:
8-
helm.sh/chart: opentelemetry-kube-stack-0.4.2
8+
helm.sh/chart: opentelemetry-kube-stack-0.4.3
99
app.kubernetes.io/version: "0.117.0"
1010
app.kubernetes.io/managed-by: Helm
1111
release: "example"

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/collector.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-daemon
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-kube-stack-0.4.2
9+
helm.sh/chart: opentelemetry-kube-stack-0.4.3
1010
app.kubernetes.io/version: "0.117.0"
1111
app.kubernetes.io/managed-by: Helm
1212
release: "example"

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-api-server/servicemonitor.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
namespace: default
88
labels:
99
app: opentelemetry-kube-stack-apiserver
10-
helm.sh/chart: opentelemetry-kube-stack-0.4.2
10+
helm.sh/chart: opentelemetry-kube-stack-0.4.3
1111
app.kubernetes.io/version: "0.117.0"
1212
app.kubernetes.io/managed-by: Helm
1313
release: "example"

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-controller-manager/service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
labels:
88
app: opentelemetry-kube-stack-kube-controller-manager
99
jobLabel: kube-controller-manager
10-
helm.sh/chart: opentelemetry-kube-stack-0.4.2
10+
helm.sh/chart: opentelemetry-kube-stack-0.4.3
1111
app.kubernetes.io/version: "0.117.0"
1212
app.kubernetes.io/managed-by: Helm
1313
release: "example"

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-controller-manager/servicemonitor.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
namespace: default
88
labels:
99
app: opentelemetry-kube-stack-kube-controller-manager
10-
helm.sh/chart: opentelemetry-kube-stack-0.4.2
10+
helm.sh/chart: opentelemetry-kube-stack-0.4.3
1111
app.kubernetes.io/version: "0.117.0"
1212
app.kubernetes.io/managed-by: Helm
1313
release: "example"

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
labels:
88
app: opentelemetry-kube-stack-kube-dns
99
jobLabel: kube-dns
10-
helm.sh/chart: opentelemetry-kube-stack-0.4.2
10+
helm.sh/chart: opentelemetry-kube-stack-0.4.3
1111
app.kubernetes.io/version: "0.117.0"
1212
app.kubernetes.io/managed-by: Helm
1313
release: "example"

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/servicemonitor.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
namespace: default
88
labels:
99
app: opentelemetry-kube-stack-kube-dns
10-
helm.sh/chart: opentelemetry-kube-stack-0.4.2
10+
helm.sh/chart: opentelemetry-kube-stack-0.4.3
1111
app.kubernetes.io/version: "0.117.0"
1212
app.kubernetes.io/managed-by: Helm
1313
release: "example"

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
labels:
88
app: opentelemetry-kube-stack-kube-etcd
99
jobLabel: kube-etcd
10-
helm.sh/chart: opentelemetry-kube-stack-0.4.2
10+
helm.sh/chart: opentelemetry-kube-stack-0.4.3
1111
app.kubernetes.io/version: "0.117.0"
1212
app.kubernetes.io/managed-by: Helm
1313
release: "example"

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/servicemonitor.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
namespace: default
88
labels:
99
app: opentelemetry-kube-stack-kube-etcd
10-
helm.sh/chart: opentelemetry-kube-stack-0.4.2
10+
helm.sh/chart: opentelemetry-kube-stack-0.4.3
1111
app.kubernetes.io/version: "0.117.0"
1212
app.kubernetes.io/managed-by: Helm
1313
release: "example"

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
labels:
88
app: opentelemetry-kube-stack-kube-proxy
99
jobLabel: kube-proxy
10-
helm.sh/chart: opentelemetry-kube-stack-0.4.2
10+
helm.sh/chart: opentelemetry-kube-stack-0.4.3
1111
app.kubernetes.io/version: "0.117.0"
1212
app.kubernetes.io/managed-by: Helm
1313
release: "example"

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/servicemonitor.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
namespace: default
88
labels:
99
app: opentelemetry-kube-stack-kube-proxy
10-
helm.sh/chart: opentelemetry-kube-stack-0.4.2
10+
helm.sh/chart: opentelemetry-kube-stack-0.4.3
1111
app.kubernetes.io/version: "0.117.0"
1212
app.kubernetes.io/managed-by: Helm
1313
release: "example"

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
labels:
88
app: opentelemetry-kube-stack-kube-scheduler
99
jobLabel: kube-scheduler
10-
helm.sh/chart: opentelemetry-kube-stack-0.4.2
10+
helm.sh/chart: opentelemetry-kube-stack-0.4.3
1111
app.kubernetes.io/version: "0.117.0"
1212
app.kubernetes.io/managed-by: Helm
1313
release: "example"

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/servicemonitor.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
namespace: default
88
labels:
99
app: opentelemetry-kube-stack-kube-scheduler
10-
helm.sh/chart: opentelemetry-kube-stack-0.4.2
10+
helm.sh/chart: opentelemetry-kube-stack-0.4.3
1111
app.kubernetes.io/version: "0.117.0"
1212
app.kubernetes.io/managed-by: Helm
1313
release: "example"

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/hooks.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,4 @@ spec:
6262
- -c
6363
- |
6464
kubectl delete instrumentations,opampbridges,opentelemetrycollectors \
65-
-l helm.sh/chart=opentelemetry-kube-stack-0.4.2
65+
-l helm.sh/chart=opentelemetry-kube-stack-0.4.3

charts/opentelemetry-kube-stack/templates/_config.tpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ processors:
8585
k8sattributes:
8686
{{- if eq .mode "daemonset" }}
8787
filter:
88-
node_from_env_var: K8S_NODE_NAME
88+
node_from_env_var: OTEL_K8S_NODE_NAME
8989
{{- end }}
9090
passthrough: false
9191
pod_association:

0 commit comments

Comments
 (0)