Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: EBPF_NET_CRASH_METRIC_PORT container env in EBPF chart not being quoted issue. #1347

Merged
merged 12 commits into from
Sep 25, 2024
Merged

fix: EBPF_NET_CRASH_METRIC_PORT container env in EBPF chart not being quoted issue. #1347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0a43de0
test: Add CI scenarios for eBPF Chart. #964
Jul 27, 2024
bddabaf
test: Add CI scenarios for eBPF Chart. [issue-964]
Aug 22, 2024
eaa5fb5
test: Add CI scenarios for eBPF Chart. [issue-964]
Aug 22, 2024
52321c4
test: Add CI scenarios for eBPF Chart. [issue-964]
Aug 22, 2024
3980893
test: Add CI scenarios for eBPF Chart. [issue-964]
Aug 22, 2024
bd4ec64
Merge remote-tracking branch 'origin/main' into issue-964
Aug 24, 2024
115f908
test: Add CI scenarios for eBPF Chart. [issue-964]
Aug 24, 2024
3a73a34
fix: EBPF_NET_CRASH_METRIC_PORT env in ebpf chart not being quoted is…
Aug 24, 2024
46d28fd
Merge branch 'main' into ebfp-container-env-quote
Aug 28, 2024
3a91eb3
Merge remote-tracking branch 'origin/main' into ebfp-container-env-quote
Sep 22, 2024
696c7a1
fix: EBPF_NET_CRASH_METRIC_PORT env in ebpf chart not being quoted is…
Sep 22, 2024
b3be6a2
Merge branch 'main' into ebfp-container-env-quote
Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/opentelemetry-ebpf/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: opentelemetry-ebpf
version: 0.1.2
version: 0.1.3
description: OpenTelemetry eBPF Helm chart for Kubernetes
type: application
home: https://opentelemetry.io/
Expand Down
2 changes: 0 additions & 2 deletions charts/opentelemetry-ebpf/ci/enabled-log-debug-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,3 @@ log:

debug:
enabled: true
storeMinidump: true
sendUnplannedExitMetric: false
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we revert it?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hyfj44255 I was wondering if it should be another ci testing, since this one is related to debug logs.

Wdyt?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @nicolastakashi let me revert it and create another -values.yaml file for testing it

11 changes: 11 additions & 0 deletions charts/opentelemetry-ebpf/ci/send-unplanned-exit-metric-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# OTLP gRPC endpoint to send the collected metrics
endpoint:
address: "example-opentelemetry-collector.default"

debug:
enabled: true
storeMinidump: true
# This will send a metric when the collector exits unexpectedly, useful to detect crashes and restarts
# The metric will be sent to the address and port defined in the endpoint section
# The port is defined as integer, but it should be quoted since it will be put to containers' env
sendUnplannedExitMetric: true
2 changes: 1 addition & 1 deletion charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: Deployment
metadata:
name: example-opentelemetry-ebpf-cloud-collector
labels:
helm.sh/chart: opentelemetry-ebpf-0.1.2
helm.sh/chart: opentelemetry-ebpf-0.1.3
app.kubernetes.io/name: opentelemetry-ebpf
app.kubernetes.io/instance: example
app.kubernetes.io/version: "v0.10.2"
Expand Down
2 changes: 1 addition & 1 deletion .../opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: ServiceAccount
metadata:
name: example-opentelemetry-ebpf-cloud-collector
labels:
helm.sh/chart: opentelemetry-ebpf-0.1.2
helm.sh/chart: opentelemetry-ebpf-0.1.3
app.kubernetes.io/name: opentelemetry-ebpf
app.kubernetes.io/instance: example
app.kubernetes.io/version: "v0.10.2"
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-ebpf/examples/cloud-collector/rendered/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: ConfigMap
metadata:
name: example-opentelemetry-ebpf-config
labels:
helm.sh/chart: opentelemetry-ebpf-0.1.2
helm.sh/chart: opentelemetry-ebpf-0.1.3
app.kubernetes.io/name: opentelemetry-ebpf
app.kubernetes.io/instance: example
app.kubernetes.io/version: "v0.10.2"
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrole.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: ClusterRole
metadata:
name: example-opentelemetry-ebpf-k8s-collector
labels:
helm.sh/chart: opentelemetry-ebpf-0.1.2
helm.sh/chart: opentelemetry-ebpf-0.1.3
app.kubernetes.io/name: opentelemetry-ebpf
app.kubernetes.io/instance: example
app.kubernetes.io/version: "v0.10.2"
Expand Down
2 changes: 1 addition & 1 deletion ...pentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrolebinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: ClusterRoleBinding
metadata:
name: example-opentelemetry-ebpf-k8s-collector
labels:
helm.sh/chart: opentelemetry-ebpf-0.1.2
helm.sh/chart: opentelemetry-ebpf-0.1.3
app.kubernetes.io/name: opentelemetry-ebpf
app.kubernetes.io/instance: example
app.kubernetes.io/version: "v0.10.2"
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ kind: Deployment
metadata:
name: example-opentelemetry-ebpf-k8s-collector
labels:
helm.sh/chart: opentelemetry-ebpf-0.1.2
helm.sh/chart: opentelemetry-ebpf-0.1.3
app.kubernetes.io/name: opentelemetry-ebpf
app.kubernetes.io/instance: example
app.kubernetes.io/version: "v0.10.2"
Expand All @@ -30,7 +30,7 @@ spec:
annotations:
# This is here to allow us to do "zero-downtime" updates without an image change.
rollingUpdateVersion: "1"
charts.flowmill.com/version: 0.1.2
charts.flowmill.com/version: 0.1.3
labels:
app.kubernetes.io/name: example-opentelemetry-ebpf-k8s-collector
app.kubernetes.io/instance: example
Expand Down
2 changes: 1 addition & 1 deletion ...ts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: ServiceAccount
metadata:
name: example-opentelemetry-ebpf-k8s-collector
labels:
helm.sh/chart: opentelemetry-ebpf-0.1.2
helm.sh/chart: opentelemetry-ebpf-0.1.3
app.kubernetes.io/name: opentelemetry-ebpf
app.kubernetes.io/instance: example
app.kubernetes.io/version: "v0.10.2"
Expand Down
2 changes: 1 addition & 1 deletion ...ts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrole.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: ClusterRole
metadata:
name: example-opentelemetry-ebpf-kernel-collector
labels:
helm.sh/chart: opentelemetry-ebpf-0.1.2
helm.sh/chart: opentelemetry-ebpf-0.1.3
app.kubernetes.io/name: opentelemetry-ebpf
app.kubernetes.io/instance: example
app.kubernetes.io/version: "v0.10.2"
Expand Down
2 changes: 1 addition & 1 deletion ...telemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrolebinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: ClusterRoleBinding
metadata:
name: example-opentelemetry-ebpf-kernel-collector
labels:
helm.sh/chart: opentelemetry-ebpf-0.1.2
helm.sh/chart: opentelemetry-ebpf-0.1.3
app.kubernetes.io/name: opentelemetry-ebpf
app.kubernetes.io/instance: example
app.kubernetes.io/version: "v0.10.2"
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ kind: DaemonSet
metadata:
name: example-opentelemetry-ebpf-kernel-collector
labels:
helm.sh/chart: opentelemetry-ebpf-0.1.2
helm.sh/chart: opentelemetry-ebpf-0.1.3
app.kubernetes.io/name: opentelemetry-ebpf
app.kubernetes.io/instance: example
app.kubernetes.io/version: "v0.10.2"
Expand All @@ -22,7 +22,7 @@ spec:
template:
metadata:
annotations:
charts.flowmill.com/version: 0.1.2
charts.flowmill.com/version: 0.1.3
labels:
app.kubernetes.io/name: example-opentelemetry-ebpf-kernel-collector
app.kubernetes.io/instance: example
Expand Down
2 changes: 1 addition & 1 deletion ...opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: ServiceAccount
metadata:
name: example-opentelemetry-ebpf-kernel-collector
labels:
helm.sh/chart: opentelemetry-ebpf-0.1.2
helm.sh/chart: opentelemetry-ebpf-0.1.3
app.kubernetes.io/name: opentelemetry-ebpf
app.kubernetes.io/instance: example
app.kubernetes.io/version: "v0.10.2"
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: Deployment
metadata:
name: example-opentelemetry-ebpf-reducer
labels:
helm.sh/chart: opentelemetry-ebpf-0.1.2
helm.sh/chart: opentelemetry-ebpf-0.1.3
app.kubernetes.io/name: opentelemetry-ebpf
app.kubernetes.io/instance: example
app.kubernetes.io/version: "v0.10.2"
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: Service
metadata:
name: example-opentelemetry-ebpf-reducer
labels:
helm.sh/chart: opentelemetry-ebpf-0.1.2
helm.sh/chart: opentelemetry-ebpf-0.1.3
app.kubernetes.io/name: opentelemetry-ebpf
app.kubernetes.io/instance: example
app.kubernetes.io/version: "v0.10.2"
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-ebpf/templates/k8s-collector-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ spec:
- name: "EBPF_NET_CRASH_METRIC_HOST"
value: {{ .Values.endpoint.address }}
- name: "EBPF_NET_CRASH_METRIC_PORT"
value: {{ .Values.endpoint.port }}
value: {{ .Values.endpoint.port | quote }}
{{- end }}
{{- if .Values.k8sCollector.relay.env }}
{{ toYaml .Values.k8sCollector.relay.env | indent 10 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-ebpf/templates/kernel-collector-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ spec:
- name: "EBPF_NET_CRASH_METRIC_HOST"
value: {{ .Values.endpoint.address }}
- name: "EBPF_NET_CRASH_METRIC_PORT"
value: {{ .Values.endpoint.port }}
value: {{ .Values.endpoint.port | quote }}
{{- end }}
{{- if .Values.kernelCollector.env }}
{{ toYaml .Values.kernelCollector.env | indent 12 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-ebpf/templates/reducer-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ spec:
- name: "EBPF_NET_CRASH_METRIC_HOST"
value: {{ .Values.endpoint.address }}
- name: "EBPF_NET_CRASH_METRIC_PORT"
value: {{ .Values.endpoint.port }}
value: {{ .Values.endpoint.port | quote }}
{{- end }}
{{- end }}
ports:
Expand Down
Loading