Skip to content

Commit 623c987

Browse files
author
hyfj44255
authored
fix: EBPF_NET_CRASH_METRIC_PORT container env in EBPF chart not being quoted issue. (#1347)
* test: Add CI scenarios for eBPF Chart. #964 Signed-off-by: Yang, Robin <Robin.Yang@fmr.com> * test: Add CI scenarios for eBPF Chart. [issue-964] Signed-off-by: Yang, Robin <Robin.Yang@fmr.com> * test: Add CI scenarios for eBPF Chart. [issue-964] Signed-off-by: Yang, Robin <Robin.Yang@fmr.com> * test: Add CI scenarios for eBPF Chart. [issue-964] Signed-off-by: Yang, Robin <Robin.Yang@fmr.com> * test: Add CI scenarios for eBPF Chart. [issue-964] Signed-off-by: Yang, Robin <Robin.Yang@fmr.com> * test: Add CI scenarios for eBPF Chart. [issue-964] Signed-off-by: Yang, Robin <Robin.Yang@fmr.com> * fix: EBPF_NET_CRASH_METRIC_PORT env in ebpf chart not being quoted issue. Signed-off-by: Yang, Robin <Robin.Yang@fmr.com> * fix: EBPF_NET_CRASH_METRIC_PORT env in ebpf chart not being quoted issue. Signed-off-by: Yang, Robin <Robin.Yang@fmr.com> --------- Signed-off-by: Yang, Robin <Robin.Yang@fmr.com>
1 parent 772048b commit 623c987

19 files changed

+30
-21
lines changed

charts/opentelemetry-ebpf/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: opentelemetry-ebpf
3-
version: 0.1.2
3+
version: 0.1.3
44
description: OpenTelemetry eBPF Helm chart for Kubernetes
55
type: application
66
home: https://opentelemetry.io/

charts/opentelemetry-ebpf/ci/enabled-log-debug-values.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,3 @@ log:
99

1010
debug:
1111
enabled: true
12-
storeMinidump: true
13-
sendUnplannedExitMetric: false
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# OTLP gRPC endpoint to send the collected metrics
2+
endpoint:
3+
address: "example-opentelemetry-collector.default"
4+
5+
debug:
6+
enabled: true
7+
storeMinidump: true
8+
# This will send a metric when the collector exits unexpectedly, useful to detect crashes and restarts
9+
# The metric will be sent to the address and port defined in the endpoint section
10+
# The port is defined as integer, but it should be quoted since it will be put to containers' env
11+
sendUnplannedExitMetric: true

charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: Deployment
55
metadata:
66
name: example-opentelemetry-ebpf-cloud-collector
77
labels:
8-
helm.sh/chart: opentelemetry-ebpf-0.1.2
8+
helm.sh/chart: opentelemetry-ebpf-0.1.3
99
app.kubernetes.io/name: opentelemetry-ebpf
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "v0.10.2"

charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-serviceaccount.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: ServiceAccount
55
metadata:
66
name: example-opentelemetry-ebpf-cloud-collector
77
labels:
8-
helm.sh/chart: opentelemetry-ebpf-0.1.2
8+
helm.sh/chart: opentelemetry-ebpf-0.1.3
99
app.kubernetes.io/name: opentelemetry-ebpf
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "v0.10.2"

charts/opentelemetry-ebpf/examples/cloud-collector/rendered/configmap.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: ConfigMap
55
metadata:
66
name: example-opentelemetry-ebpf-config
77
labels:
8-
helm.sh/chart: opentelemetry-ebpf-0.1.2
8+
helm.sh/chart: opentelemetry-ebpf-0.1.3
99
app.kubernetes.io/name: opentelemetry-ebpf
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "v0.10.2"

charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrole.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: ClusterRole
55
metadata:
66
name: example-opentelemetry-ebpf-k8s-collector
77
labels:
8-
helm.sh/chart: opentelemetry-ebpf-0.1.2
8+
helm.sh/chart: opentelemetry-ebpf-0.1.3
99
app.kubernetes.io/name: opentelemetry-ebpf
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "v0.10.2"

charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrolebinding.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: ClusterRoleBinding
55
metadata:
66
name: example-opentelemetry-ebpf-k8s-collector
77
labels:
8-
helm.sh/chart: opentelemetry-ebpf-0.1.2
8+
helm.sh/chart: opentelemetry-ebpf-0.1.3
99
app.kubernetes.io/name: opentelemetry-ebpf
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "v0.10.2"

charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-deployment.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ kind: Deployment
1010
metadata:
1111
name: example-opentelemetry-ebpf-k8s-collector
1212
labels:
13-
helm.sh/chart: opentelemetry-ebpf-0.1.2
13+
helm.sh/chart: opentelemetry-ebpf-0.1.3
1414
app.kubernetes.io/name: opentelemetry-ebpf
1515
app.kubernetes.io/instance: example
1616
app.kubernetes.io/version: "v0.10.2"
@@ -30,7 +30,7 @@ spec:
3030
annotations:
3131
# This is here to allow us to do "zero-downtime" updates without an image change.
3232
rollingUpdateVersion: "1"
33-
charts.flowmill.com/version: 0.1.2
33+
charts.flowmill.com/version: 0.1.3
3434
labels:
3535
app.kubernetes.io/name: example-opentelemetry-ebpf-k8s-collector
3636
app.kubernetes.io/instance: example

charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-serviceaccount.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: ServiceAccount
55
metadata:
66
name: example-opentelemetry-ebpf-k8s-collector
77
labels:
8-
helm.sh/chart: opentelemetry-ebpf-0.1.2
8+
helm.sh/chart: opentelemetry-ebpf-0.1.3
99
app.kubernetes.io/name: opentelemetry-ebpf
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "v0.10.2"

charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrole.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: ClusterRole
55
metadata:
66
name: example-opentelemetry-ebpf-kernel-collector
77
labels:
8-
helm.sh/chart: opentelemetry-ebpf-0.1.2
8+
helm.sh/chart: opentelemetry-ebpf-0.1.3
99
app.kubernetes.io/name: opentelemetry-ebpf
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "v0.10.2"

charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrolebinding.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: ClusterRoleBinding
55
metadata:
66
name: example-opentelemetry-ebpf-kernel-collector
77
labels:
8-
helm.sh/chart: opentelemetry-ebpf-0.1.2
8+
helm.sh/chart: opentelemetry-ebpf-0.1.3
99
app.kubernetes.io/name: opentelemetry-ebpf
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "v0.10.2"

charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-daemonset.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ kind: DaemonSet
99
metadata:
1010
name: example-opentelemetry-ebpf-kernel-collector
1111
labels:
12-
helm.sh/chart: opentelemetry-ebpf-0.1.2
12+
helm.sh/chart: opentelemetry-ebpf-0.1.3
1313
app.kubernetes.io/name: opentelemetry-ebpf
1414
app.kubernetes.io/instance: example
1515
app.kubernetes.io/version: "v0.10.2"
@@ -22,7 +22,7 @@ spec:
2222
template:
2323
metadata:
2424
annotations:
25-
charts.flowmill.com/version: 0.1.2
25+
charts.flowmill.com/version: 0.1.3
2626
labels:
2727
app.kubernetes.io/name: example-opentelemetry-ebpf-kernel-collector
2828
app.kubernetes.io/instance: example

charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-serviceaccount.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: ServiceAccount
55
metadata:
66
name: example-opentelemetry-ebpf-kernel-collector
77
labels:
8-
helm.sh/chart: opentelemetry-ebpf-0.1.2
8+
helm.sh/chart: opentelemetry-ebpf-0.1.3
99
app.kubernetes.io/name: opentelemetry-ebpf
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "v0.10.2"

charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: Deployment
55
metadata:
66
name: example-opentelemetry-ebpf-reducer
77
labels:
8-
helm.sh/chart: opentelemetry-ebpf-0.1.2
8+
helm.sh/chart: opentelemetry-ebpf-0.1.3
99
app.kubernetes.io/name: opentelemetry-ebpf
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "v0.10.2"

charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: Service
55
metadata:
66
name: example-opentelemetry-ebpf-reducer
77
labels:
8-
helm.sh/chart: opentelemetry-ebpf-0.1.2
8+
helm.sh/chart: opentelemetry-ebpf-0.1.3
99
app.kubernetes.io/name: opentelemetry-ebpf
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "v0.10.2"

charts/opentelemetry-ebpf/templates/k8s-collector-deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ spec:
119119
- name: "EBPF_NET_CRASH_METRIC_HOST"
120120
value: {{ .Values.endpoint.address }}
121121
- name: "EBPF_NET_CRASH_METRIC_PORT"
122-
value: {{ .Values.endpoint.port }}
122+
value: {{ .Values.endpoint.port | quote }}
123123
{{- end }}
124124
{{- if .Values.k8sCollector.relay.env }}
125125
{{ toYaml .Values.k8sCollector.relay.env | indent 10 }}

charts/opentelemetry-ebpf/templates/kernel-collector-daemonset.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ spec:
113113
- name: "EBPF_NET_CRASH_METRIC_HOST"
114114
value: {{ .Values.endpoint.address }}
115115
- name: "EBPF_NET_CRASH_METRIC_PORT"
116-
value: {{ .Values.endpoint.port }}
116+
value: {{ .Values.endpoint.port | quote }}
117117
{{- end }}
118118
{{- if .Values.kernelCollector.env }}
119119
{{ toYaml .Values.kernelCollector.env | indent 12 }}

charts/opentelemetry-ebpf/templates/reducer-deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ spec:
7272
- name: "EBPF_NET_CRASH_METRIC_HOST"
7373
value: {{ .Values.endpoint.address }}
7474
- name: "EBPF_NET_CRASH_METRIC_PORT"
75-
value: {{ .Values.endpoint.port }}
75+
value: {{ .Values.endpoint.port | quote }}
7676
{{- end }}
7777
{{- end }}
7878
ports:

0 commit comments

Comments
 (0)