From 0a43de0052eec962050b89c33d64674da45a34d6 Mon Sep 17 00:00:00 2001 From: "Yang, Robin" Date: Sat, 27 Jul 2024 10:47:04 +0800 Subject: [PATCH 01/10] test: Add CI scenarios for eBPF Chart. #964 Signed-off-by: Yang, Robin --- charts/opentelemetry-ebpf/Chart.yaml | 2 +- .../ci/enabled-log-debug-values.yaml | 13 ++++ .../ci/requests-limits-values.yaml | 63 +++++++++++++++++++ .../rendered/cloud-collector-deployment.yaml | 2 +- .../cloud-collector-serviceaccount.yaml | 2 +- .../cloud-collector/rendered/configmap.yaml | 2 +- .../rendered/k8s-collector-clusterrole.yaml | 2 +- .../k8s-collector-clusterrolebinding.yaml | 2 +- .../rendered/k8s-collector-deployment.yaml | 4 +- .../k8s-collector-serviceaccount.yaml | 2 +- .../kernel-collector-clusterrole.yaml | 2 +- .../kernel-collector-clusterrolebinding.yaml | 2 +- .../rendered/kernel-collector-daemonset.yaml | 4 +- .../kernel-collector-serviceaccount.yaml | 2 +- .../rendered/reducer-deployment.yaml | 2 +- .../rendered/reducer-service.yaml | 2 +- .../templates/k8s-collector-deployment.yaml | 2 +- .../templates/kernel-collector-daemonset.yaml | 2 +- .../templates/reducer-deployment.yaml | 2 +- 19 files changed, 95 insertions(+), 19 deletions(-) create mode 100644 charts/opentelemetry-ebpf/ci/enabled-log-debug-values.yaml create mode 100644 charts/opentelemetry-ebpf/ci/requests-limits-values.yaml diff --git a/charts/opentelemetry-ebpf/Chart.yaml b/charts/opentelemetry-ebpf/Chart.yaml index 220a31e25..207ce2abd 100644 --- a/charts/opentelemetry-ebpf/Chart.yaml +++ b/charts/opentelemetry-ebpf/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: opentelemetry-ebpf -version: 0.1.0 +version: 0.1.1 description: OpenTelemetry eBPF Helm chart for Kubernetes type: application home: https://opentelemetry.io/ diff --git a/charts/opentelemetry-ebpf/ci/enabled-log-debug-values.yaml b/charts/opentelemetry-ebpf/ci/enabled-log-debug-values.yaml new file mode 100644 index 000000000..5bd9c22ad --- /dev/null +++ b/charts/opentelemetry-ebpf/ci/enabled-log-debug-values.yaml @@ -0,0 +1,13 @@ +# OTLP gRPC endpoint to send the collected metrics +endpoint: + address: "example-opentelemetry-collector.default" + +# enable --log-console +log: + console: true + level: trace + +debug: + enabled: true + storeMinidump: true + sendUnplannedExitMetric: true \ No newline at end of file diff --git a/charts/opentelemetry-ebpf/ci/requests-limits-values.yaml b/charts/opentelemetry-ebpf/ci/requests-limits-values.yaml new file mode 100644 index 000000000..2b7e7e7e3 --- /dev/null +++ b/charts/opentelemetry-ebpf/ci/requests-limits-values.yaml @@ -0,0 +1,63 @@ +# just for reducer +resources: + requests: + memory: "128Mi" + cpu: "200m" + limits: + memory: "256Mi" + cpu: "300m" + +# OTLP gRPC endpoint to send the collected metrics +endpoint: + address: "example-opentelemetry-collector.default" + +reducer: + extraArgs: + - --disable-prometheus-metrics + + disableMetrics: + - none + enableMetrics: + ### to enable an entire metric category: ### + - tcp.all + - udp.all + - dns.all + - http.all + - ebpf_net.all + +kernelCollector: + resources: + requests: + memory: "128Mi" + cpu: "200m" + limits: + memory: "256Mi" + cpu: "300m" + +cloudCollector: + enabled: true + resources: + requests: + memory: "128Mi" + cpu: "200m" + limits: + memory: "256Mi" + cpu: "300m" + +k8sCollector: + relay: + resources: + requests: + memory: "128Mi" + cpu: "200m" + limits: + memory: "256Mi" + cpu: "300m" + watcher: + resources: + requests: + memory: "128Mi" + cpu: "200m" + limits: + memory: "256Mi" + cpu: "300m" \ No newline at end of file diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-deployment.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-deployment.yaml index 43942d5af..b30918a58 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-deployment.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-deployment.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: example-opentelemetry-ebpf-cloud-collector labels: - helm.sh/chart: opentelemetry-ebpf-0.1.0 + helm.sh/chart: opentelemetry-ebpf-0.1.1 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.0" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-serviceaccount.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-serviceaccount.yaml index de573352f..3e5ad4721 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-serviceaccount.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-opentelemetry-ebpf-cloud-collector labels: - helm.sh/chart: opentelemetry-ebpf-0.1.0 + helm.sh/chart: opentelemetry-ebpf-0.1.1 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.0" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/configmap.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/configmap.yaml index 2c79cc9a5..af144a2f0 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/configmap.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/configmap.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-opentelemetry-ebpf-config labels: - helm.sh/chart: opentelemetry-ebpf-0.1.0 + helm.sh/chart: opentelemetry-ebpf-0.1.1 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.0" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrole.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrole.yaml index dd202d0e3..49968ae85 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrole.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrole.yaml @@ -5,7 +5,7 @@ kind: ClusterRole metadata: name: example-opentelemetry-ebpf-k8s-collector labels: - helm.sh/chart: opentelemetry-ebpf-0.1.0 + helm.sh/chart: opentelemetry-ebpf-0.1.1 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.0" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrolebinding.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrolebinding.yaml index 151df6b06..7838f1464 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrolebinding.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrolebinding.yaml @@ -5,7 +5,7 @@ kind: ClusterRoleBinding metadata: name: example-opentelemetry-ebpf-k8s-collector labels: - helm.sh/chart: opentelemetry-ebpf-0.1.0 + helm.sh/chart: opentelemetry-ebpf-0.1.1 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.0" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-deployment.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-deployment.yaml index b2bb6d772..4117c6cc7 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-deployment.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-deployment.yaml @@ -10,7 +10,7 @@ kind: Deployment metadata: name: example-opentelemetry-ebpf-k8s-collector labels: - helm.sh/chart: opentelemetry-ebpf-0.1.0 + helm.sh/chart: opentelemetry-ebpf-0.1.1 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.0" @@ -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.0 + charts.flowmill.com/version: 0.1.1 labels: app.kubernetes.io/name: example-opentelemetry-ebpf-k8s-collector app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-serviceaccount.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-serviceaccount.yaml index 55d527c41..e51b63a8a 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-serviceaccount.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-opentelemetry-ebpf-k8s-collector labels: - helm.sh/chart: opentelemetry-ebpf-0.1.0 + helm.sh/chart: opentelemetry-ebpf-0.1.1 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.0" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrole.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrole.yaml index edb0fff5f..14d880fdf 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrole.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrole.yaml @@ -5,7 +5,7 @@ kind: ClusterRole metadata: name: example-opentelemetry-ebpf-kernel-collector labels: - helm.sh/chart: opentelemetry-ebpf-0.1.0 + helm.sh/chart: opentelemetry-ebpf-0.1.1 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.0" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrolebinding.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrolebinding.yaml index 1014ba8b9..0112368cc 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrolebinding.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrolebinding.yaml @@ -5,7 +5,7 @@ kind: ClusterRoleBinding metadata: name: example-opentelemetry-ebpf-kernel-collector labels: - helm.sh/chart: opentelemetry-ebpf-0.1.0 + helm.sh/chart: opentelemetry-ebpf-0.1.1 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.0" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-daemonset.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-daemonset.yaml index 2027790bb..be22cac20 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-daemonset.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-daemonset.yaml @@ -9,7 +9,7 @@ kind: DaemonSet metadata: name: example-opentelemetry-ebpf-kernel-collector labels: - helm.sh/chart: opentelemetry-ebpf-0.1.0 + helm.sh/chart: opentelemetry-ebpf-0.1.1 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.0" @@ -22,7 +22,7 @@ spec: template: metadata: annotations: - charts.flowmill.com/version: 0.1.0 + charts.flowmill.com/version: 0.1.1 labels: app.kubernetes.io/name: example-opentelemetry-ebpf-kernel-collector app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-serviceaccount.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-serviceaccount.yaml index dbfd73dc1..8f6af877a 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-serviceaccount.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-opentelemetry-ebpf-kernel-collector labels: - helm.sh/chart: opentelemetry-ebpf-0.1.0 + helm.sh/chart: opentelemetry-ebpf-0.1.1 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.0" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-deployment.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-deployment.yaml index 6274ebcca..03c2ad526 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-deployment.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-deployment.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: example-opentelemetry-ebpf-reducer labels: - helm.sh/chart: opentelemetry-ebpf-0.1.0 + helm.sh/chart: opentelemetry-ebpf-0.1.1 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.0" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-service.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-service.yaml index e75e0012d..d1adc12e2 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-service.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-service.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-opentelemetry-ebpf-reducer labels: - helm.sh/chart: opentelemetry-ebpf-0.1.0 + helm.sh/chart: opentelemetry-ebpf-0.1.1 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.0" diff --git a/charts/opentelemetry-ebpf/templates/k8s-collector-deployment.yaml b/charts/opentelemetry-ebpf/templates/k8s-collector-deployment.yaml index 9234b5d2a..8ba2a84dd 100644 --- a/charts/opentelemetry-ebpf/templates/k8s-collector-deployment.yaml +++ b/charts/opentelemetry-ebpf/templates/k8s-collector-deployment.yaml @@ -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 }} diff --git a/charts/opentelemetry-ebpf/templates/kernel-collector-daemonset.yaml b/charts/opentelemetry-ebpf/templates/kernel-collector-daemonset.yaml index 01505798f..ed3764403 100644 --- a/charts/opentelemetry-ebpf/templates/kernel-collector-daemonset.yaml +++ b/charts/opentelemetry-ebpf/templates/kernel-collector-daemonset.yaml @@ -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 }} diff --git a/charts/opentelemetry-ebpf/templates/reducer-deployment.yaml b/charts/opentelemetry-ebpf/templates/reducer-deployment.yaml index 6a704aa49..996b9a79e 100644 --- a/charts/opentelemetry-ebpf/templates/reducer-deployment.yaml +++ b/charts/opentelemetry-ebpf/templates/reducer-deployment.yaml @@ -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: From bddabaff0fd0c5cc16227b61bd7200523e4ba6c5 Mon Sep 17 00:00:00 2001 From: "Yang, Robin" Date: Thu, 22 Aug 2024 15:29:33 +0800 Subject: [PATCH 02/10] test: Add CI scenarios for eBPF Chart. [issue-964] Signed-off-by: Yang, Robin --- charts/opentelemetry-ebpf/ci/enabled-log-debug-values.yaml | 4 ++-- charts/opentelemetry-ebpf/ci/requests-limits-values.yaml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/opentelemetry-ebpf/ci/enabled-log-debug-values.yaml b/charts/opentelemetry-ebpf/ci/enabled-log-debug-values.yaml index 5bd9c22ad..510b1094b 100644 --- a/charts/opentelemetry-ebpf/ci/enabled-log-debug-values.yaml +++ b/charts/opentelemetry-ebpf/ci/enabled-log-debug-values.yaml @@ -1,6 +1,6 @@ # OTLP gRPC endpoint to send the collected metrics endpoint: - address: "example-opentelemetry-collector.default" + address: "example-opentelemetry-collector.default" # enable --log-console log: @@ -10,4 +10,4 @@ log: debug: enabled: true storeMinidump: true - sendUnplannedExitMetric: true \ No newline at end of file + sendUnplannedExitMetric: true diff --git a/charts/opentelemetry-ebpf/ci/requests-limits-values.yaml b/charts/opentelemetry-ebpf/ci/requests-limits-values.yaml index 2b7e7e7e3..df31e90dc 100644 --- a/charts/opentelemetry-ebpf/ci/requests-limits-values.yaml +++ b/charts/opentelemetry-ebpf/ci/requests-limits-values.yaml @@ -9,11 +9,11 @@ resources: # OTLP gRPC endpoint to send the collected metrics endpoint: - address: "example-opentelemetry-collector.default" + address: "example-opentelemetry-collector.default" reducer: extraArgs: - - --disable-prometheus-metrics + - --disable-prometheus-metrics disableMetrics: - none @@ -60,4 +60,4 @@ k8sCollector: cpu: "200m" limits: memory: "256Mi" - cpu: "300m" \ No newline at end of file + cpu: "300m" From eaa5fb52fbe0e7665e5c41ffc89d1c2899f74f1c Mon Sep 17 00:00:00 2001 From: "Yang, Robin" Date: Thu, 22 Aug 2024 15:46:46 +0800 Subject: [PATCH 03/10] test: Add CI scenarios for eBPF Chart. [issue-964] Signed-off-by: Yang, Robin --- charts/opentelemetry-ebpf/ci/enabled-log-debug-values.yaml | 2 +- .../templates/k8s-collector-deployment.yaml | 6 +++--- .../templates/kernel-collector-daemonset.yaml | 2 +- charts/opentelemetry-ebpf/templates/reducer-deployment.yaml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/charts/opentelemetry-ebpf/ci/enabled-log-debug-values.yaml b/charts/opentelemetry-ebpf/ci/enabled-log-debug-values.yaml index 510b1094b..4173baf60 100644 --- a/charts/opentelemetry-ebpf/ci/enabled-log-debug-values.yaml +++ b/charts/opentelemetry-ebpf/ci/enabled-log-debug-values.yaml @@ -10,4 +10,4 @@ log: debug: enabled: true storeMinidump: true - sendUnplannedExitMetric: true + sendUnplannedExitMetric: false diff --git a/charts/opentelemetry-ebpf/templates/k8s-collector-deployment.yaml b/charts/opentelemetry-ebpf/templates/k8s-collector-deployment.yaml index 8ba2a84dd..6a3d85a83 100644 --- a/charts/opentelemetry-ebpf/templates/k8s-collector-deployment.yaml +++ b/charts/opentelemetry-ebpf/templates/k8s-collector-deployment.yaml @@ -37,7 +37,7 @@ spec: {{- end }} {{- end }} containers: - - name: k8s-watcher + - name: k8s-watcher {{- if .Values.k8sCollector.watcher.image.tag }} image: "{{ default .Values.image.registry .Values.k8sCollector.watcher.image.repository }}/{{ .Values.k8sCollector.watcher.image.name }}:{{ .Values.k8sCollector.watcher.image.tag }}" {{- else }} @@ -63,7 +63,7 @@ spec: image: "{{ default .Values.image.registry .Values.k8sCollector.relay.image.registry }}/{{ .Values.k8sCollector.relay.image.name }}:{{ default .Chart.AppVersion .Values.k8sCollector.relay.image.tag }}" {{- end }} imagePullPolicy: {{ .Values.image.pullPolicy }} - + {{- if hasKey .Values.k8sCollector.relay "resources" }} resources: {{ toYaml .Values.k8sCollector.relay.resources | indent 10 }} @@ -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 | quote }} + value: {{ .Values.endpoint.port }} {{- end }} {{- if .Values.k8sCollector.relay.env }} {{ toYaml .Values.k8sCollector.relay.env | indent 10 }} diff --git a/charts/opentelemetry-ebpf/templates/kernel-collector-daemonset.yaml b/charts/opentelemetry-ebpf/templates/kernel-collector-daemonset.yaml index ed3764403..01505798f 100644 --- a/charts/opentelemetry-ebpf/templates/kernel-collector-daemonset.yaml +++ b/charts/opentelemetry-ebpf/templates/kernel-collector-daemonset.yaml @@ -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 | quote }} + value: {{ .Values.endpoint.port }} {{- end }} {{- if .Values.kernelCollector.env }} {{ toYaml .Values.kernelCollector.env | indent 12 }} diff --git a/charts/opentelemetry-ebpf/templates/reducer-deployment.yaml b/charts/opentelemetry-ebpf/templates/reducer-deployment.yaml index 996b9a79e..e4832eefd 100644 --- a/charts/opentelemetry-ebpf/templates/reducer-deployment.yaml +++ b/charts/opentelemetry-ebpf/templates/reducer-deployment.yaml @@ -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 | quote}} + value: {{ .Values.endpoint.port }} {{- end }} {{- end }} ports: @@ -101,7 +101,7 @@ spec: {{- if .Values.resources }} resources: {{- toYaml .Values.resources | nindent 12 }} - {{- end }} + {{- end }} {{- with .Values.reducer.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} From 52321c4bad629a207738a25ae297f71786990137 Mon Sep 17 00:00:00 2001 From: "Yang, Robin" Date: Thu, 22 Aug 2024 15:49:41 +0800 Subject: [PATCH 04/10] test: Add CI scenarios for eBPF Chart. [issue-964] Signed-off-by: Yang, Robin --- .../templates/k8s-collector-deployment.yaml | 4 ++-- charts/opentelemetry-ebpf/templates/reducer-deployment.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/opentelemetry-ebpf/templates/k8s-collector-deployment.yaml b/charts/opentelemetry-ebpf/templates/k8s-collector-deployment.yaml index 6a3d85a83..9234b5d2a 100644 --- a/charts/opentelemetry-ebpf/templates/k8s-collector-deployment.yaml +++ b/charts/opentelemetry-ebpf/templates/k8s-collector-deployment.yaml @@ -37,7 +37,7 @@ spec: {{- end }} {{- end }} containers: - - name: k8s-watcher + - name: k8s-watcher {{- if .Values.k8sCollector.watcher.image.tag }} image: "{{ default .Values.image.registry .Values.k8sCollector.watcher.image.repository }}/{{ .Values.k8sCollector.watcher.image.name }}:{{ .Values.k8sCollector.watcher.image.tag }}" {{- else }} @@ -63,7 +63,7 @@ spec: image: "{{ default .Values.image.registry .Values.k8sCollector.relay.image.registry }}/{{ .Values.k8sCollector.relay.image.name }}:{{ default .Chart.AppVersion .Values.k8sCollector.relay.image.tag }}" {{- end }} imagePullPolicy: {{ .Values.image.pullPolicy }} - + {{- if hasKey .Values.k8sCollector.relay "resources" }} resources: {{ toYaml .Values.k8sCollector.relay.resources | indent 10 }} diff --git a/charts/opentelemetry-ebpf/templates/reducer-deployment.yaml b/charts/opentelemetry-ebpf/templates/reducer-deployment.yaml index e4832eefd..e8fe85da8 100644 --- a/charts/opentelemetry-ebpf/templates/reducer-deployment.yaml +++ b/charts/opentelemetry-ebpf/templates/reducer-deployment.yaml @@ -101,7 +101,7 @@ spec: {{- if .Values.resources }} resources: {{- toYaml .Values.resources | nindent 12 }} - {{- end }} + {{- end }} {{- with .Values.reducer.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} From 3980893e22bb2ded0c6f5241105f4dd2097a0067 Mon Sep 17 00:00:00 2001 From: "Yang, Robin" Date: Thu, 22 Aug 2024 15:50:35 +0800 Subject: [PATCH 05/10] test: Add CI scenarios for eBPF Chart. [issue-964] Signed-off-by: Yang, Robin --- charts/opentelemetry-ebpf/templates/reducer-deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/opentelemetry-ebpf/templates/reducer-deployment.yaml b/charts/opentelemetry-ebpf/templates/reducer-deployment.yaml index e8fe85da8..6a704aa49 100644 --- a/charts/opentelemetry-ebpf/templates/reducer-deployment.yaml +++ b/charts/opentelemetry-ebpf/templates/reducer-deployment.yaml @@ -101,7 +101,7 @@ spec: {{- if .Values.resources }} resources: {{- toYaml .Values.resources | nindent 12 }} - {{- end }} + {{- end }} {{- with .Values.reducer.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} From 115f90860040b50a70fefb79607ad0f446aefb1a Mon Sep 17 00:00:00 2001 From: "Yang, Robin" Date: Sat, 24 Aug 2024 13:52:51 +0800 Subject: [PATCH 06/10] test: Add CI scenarios for eBPF Chart. [issue-964] Signed-off-by: Yang, Robin --- charts/opentelemetry-ebpf/Chart.yaml | 2 +- .../cloud-collector/rendered/cloud-collector-deployment.yaml | 2 +- .../rendered/cloud-collector-serviceaccount.yaml | 2 +- .../examples/cloud-collector/rendered/configmap.yaml | 2 +- .../cloud-collector/rendered/k8s-collector-clusterrole.yaml | 2 +- .../rendered/k8s-collector-clusterrolebinding.yaml | 2 +- .../cloud-collector/rendered/k8s-collector-deployment.yaml | 4 ++-- .../rendered/k8s-collector-serviceaccount.yaml | 2 +- .../rendered/kernel-collector-clusterrole.yaml | 2 +- .../rendered/kernel-collector-clusterrolebinding.yaml | 2 +- .../cloud-collector/rendered/kernel-collector-daemonset.yaml | 4 ++-- .../rendered/kernel-collector-serviceaccount.yaml | 2 +- .../examples/cloud-collector/rendered/reducer-deployment.yaml | 2 +- .../examples/cloud-collector/rendered/reducer-service.yaml | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/charts/opentelemetry-ebpf/Chart.yaml b/charts/opentelemetry-ebpf/Chart.yaml index fd5a09d8c..a7e2885b4 100644 --- a/charts/opentelemetry-ebpf/Chart.yaml +++ b/charts/opentelemetry-ebpf/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: opentelemetry-ebpf -version: 0.1.1 +version: 0.1.2 description: OpenTelemetry eBPF Helm chart for Kubernetes type: application home: https://opentelemetry.io/ diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-deployment.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-deployment.yaml index 13ff9cbba..c5fd3e9fc 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-deployment.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-deployment.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: example-opentelemetry-ebpf-cloud-collector labels: - helm.sh/chart: opentelemetry-ebpf-0.1.1 + helm.sh/chart: opentelemetry-ebpf-0.1.2 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.2" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-serviceaccount.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-serviceaccount.yaml index 7609343ba..6c690d6ab 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-serviceaccount.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-opentelemetry-ebpf-cloud-collector labels: - helm.sh/chart: opentelemetry-ebpf-0.1.1 + helm.sh/chart: opentelemetry-ebpf-0.1.2 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.2" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/configmap.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/configmap.yaml index 67ad5f401..6220d35ec 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/configmap.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/configmap.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-opentelemetry-ebpf-config labels: - helm.sh/chart: opentelemetry-ebpf-0.1.1 + helm.sh/chart: opentelemetry-ebpf-0.1.2 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.2" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrole.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrole.yaml index c378dad9e..fb3a35d03 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrole.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrole.yaml @@ -5,7 +5,7 @@ kind: ClusterRole metadata: name: example-opentelemetry-ebpf-k8s-collector labels: - helm.sh/chart: opentelemetry-ebpf-0.1.1 + helm.sh/chart: opentelemetry-ebpf-0.1.2 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.2" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrolebinding.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrolebinding.yaml index 0580cde6e..75b3a1852 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrolebinding.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrolebinding.yaml @@ -5,7 +5,7 @@ kind: ClusterRoleBinding metadata: name: example-opentelemetry-ebpf-k8s-collector labels: - helm.sh/chart: opentelemetry-ebpf-0.1.1 + helm.sh/chart: opentelemetry-ebpf-0.1.2 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.2" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-deployment.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-deployment.yaml index b26bc49b0..f83a39cef 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-deployment.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-deployment.yaml @@ -10,7 +10,7 @@ kind: Deployment metadata: name: example-opentelemetry-ebpf-k8s-collector labels: - helm.sh/chart: opentelemetry-ebpf-0.1.1 + helm.sh/chart: opentelemetry-ebpf-0.1.2 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.2" @@ -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.1 + charts.flowmill.com/version: 0.1.2 labels: app.kubernetes.io/name: example-opentelemetry-ebpf-k8s-collector app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-serviceaccount.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-serviceaccount.yaml index a341fab87..f4b05e80e 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-serviceaccount.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-opentelemetry-ebpf-k8s-collector labels: - helm.sh/chart: opentelemetry-ebpf-0.1.1 + helm.sh/chart: opentelemetry-ebpf-0.1.2 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.2" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrole.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrole.yaml index 5a1844bc9..663b81ac0 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrole.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrole.yaml @@ -5,7 +5,7 @@ kind: ClusterRole metadata: name: example-opentelemetry-ebpf-kernel-collector labels: - helm.sh/chart: opentelemetry-ebpf-0.1.1 + helm.sh/chart: opentelemetry-ebpf-0.1.2 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.2" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrolebinding.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrolebinding.yaml index 9b171edcd..d264ac3d9 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrolebinding.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrolebinding.yaml @@ -5,7 +5,7 @@ kind: ClusterRoleBinding metadata: name: example-opentelemetry-ebpf-kernel-collector labels: - helm.sh/chart: opentelemetry-ebpf-0.1.1 + helm.sh/chart: opentelemetry-ebpf-0.1.2 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.2" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-daemonset.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-daemonset.yaml index 2a12294e6..f148b3ae0 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-daemonset.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-daemonset.yaml @@ -9,7 +9,7 @@ kind: DaemonSet metadata: name: example-opentelemetry-ebpf-kernel-collector labels: - helm.sh/chart: opentelemetry-ebpf-0.1.1 + helm.sh/chart: opentelemetry-ebpf-0.1.2 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.2" @@ -22,7 +22,7 @@ spec: template: metadata: annotations: - charts.flowmill.com/version: 0.1.1 + charts.flowmill.com/version: 0.1.2 labels: app.kubernetes.io/name: example-opentelemetry-ebpf-kernel-collector app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-serviceaccount.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-serviceaccount.yaml index 270512954..ea4bf0203 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-serviceaccount.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-opentelemetry-ebpf-kernel-collector labels: - helm.sh/chart: opentelemetry-ebpf-0.1.1 + helm.sh/chart: opentelemetry-ebpf-0.1.2 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.2" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-deployment.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-deployment.yaml index 69e2bd7fa..de5a4908b 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-deployment.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-deployment.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: example-opentelemetry-ebpf-reducer labels: - helm.sh/chart: opentelemetry-ebpf-0.1.1 + helm.sh/chart: opentelemetry-ebpf-0.1.2 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.2" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-service.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-service.yaml index 1f2d10234..63c7a9c0d 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-service.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-service.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-opentelemetry-ebpf-reducer labels: - helm.sh/chart: opentelemetry-ebpf-0.1.1 + helm.sh/chart: opentelemetry-ebpf-0.1.2 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.2" From 3a73a34d494742e568a0d2ef71e7016122fdc9ea Mon Sep 17 00:00:00 2001 From: "Yang, Robin" Date: Sat, 24 Aug 2024 14:45:57 +0800 Subject: [PATCH 07/10] fix: EBPF_NET_CRASH_METRIC_PORT env in ebpf chart not being quoted issue. Signed-off-by: Yang, Robin --- charts/opentelemetry-ebpf/Chart.yaml | 2 +- charts/opentelemetry-ebpf/ci/enabled-log-debug-values.yaml | 2 +- .../cloud-collector/rendered/cloud-collector-deployment.yaml | 2 +- .../rendered/cloud-collector-serviceaccount.yaml | 2 +- .../examples/cloud-collector/rendered/configmap.yaml | 2 +- .../cloud-collector/rendered/k8s-collector-clusterrole.yaml | 2 +- .../rendered/k8s-collector-clusterrolebinding.yaml | 2 +- .../cloud-collector/rendered/k8s-collector-deployment.yaml | 4 ++-- .../rendered/k8s-collector-serviceaccount.yaml | 2 +- .../rendered/kernel-collector-clusterrole.yaml | 2 +- .../rendered/kernel-collector-clusterrolebinding.yaml | 2 +- .../cloud-collector/rendered/kernel-collector-daemonset.yaml | 4 ++-- .../rendered/kernel-collector-serviceaccount.yaml | 2 +- .../examples/cloud-collector/rendered/reducer-deployment.yaml | 2 +- .../examples/cloud-collector/rendered/reducer-service.yaml | 2 +- .../templates/k8s-collector-deployment.yaml | 2 +- .../templates/kernel-collector-daemonset.yaml | 2 +- charts/opentelemetry-ebpf/templates/reducer-deployment.yaml | 2 +- 18 files changed, 20 insertions(+), 20 deletions(-) diff --git a/charts/opentelemetry-ebpf/Chart.yaml b/charts/opentelemetry-ebpf/Chart.yaml index a7e2885b4..ac74918be 100644 --- a/charts/opentelemetry-ebpf/Chart.yaml +++ b/charts/opentelemetry-ebpf/Chart.yaml @@ -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/ diff --git a/charts/opentelemetry-ebpf/ci/enabled-log-debug-values.yaml b/charts/opentelemetry-ebpf/ci/enabled-log-debug-values.yaml index 4173baf60..510b1094b 100644 --- a/charts/opentelemetry-ebpf/ci/enabled-log-debug-values.yaml +++ b/charts/opentelemetry-ebpf/ci/enabled-log-debug-values.yaml @@ -10,4 +10,4 @@ log: debug: enabled: true storeMinidump: true - sendUnplannedExitMetric: false + sendUnplannedExitMetric: true diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-deployment.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-deployment.yaml index c5fd3e9fc..5a28ec17b 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-deployment.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-deployment.yaml @@ -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" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-serviceaccount.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-serviceaccount.yaml index 6c690d6ab..43ddf8cd2 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-serviceaccount.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-serviceaccount.yaml @@ -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" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/configmap.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/configmap.yaml index 6220d35ec..0ce234f4d 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/configmap.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/configmap.yaml @@ -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" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrole.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrole.yaml index fb3a35d03..e8d9c29a0 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrole.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrole.yaml @@ -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" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrolebinding.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrolebinding.yaml index 75b3a1852..098f17d84 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrolebinding.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrolebinding.yaml @@ -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" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-deployment.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-deployment.yaml index f83a39cef..7fd5ac416 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-deployment.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-deployment.yaml @@ -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" @@ -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 diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-serviceaccount.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-serviceaccount.yaml index f4b05e80e..2caeeecf8 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-serviceaccount.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-serviceaccount.yaml @@ -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" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrole.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrole.yaml index 663b81ac0..81bc77fd3 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrole.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrole.yaml @@ -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" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrolebinding.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrolebinding.yaml index d264ac3d9..3adc5106a 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrolebinding.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrolebinding.yaml @@ -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" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-daemonset.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-daemonset.yaml index f148b3ae0..271e3b4b8 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-daemonset.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-daemonset.yaml @@ -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" @@ -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 diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-serviceaccount.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-serviceaccount.yaml index ea4bf0203..f9c220abc 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-serviceaccount.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-serviceaccount.yaml @@ -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" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-deployment.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-deployment.yaml index de5a4908b..ef95c0b18 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-deployment.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-deployment.yaml @@ -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" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-service.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-service.yaml index 63c7a9c0d..a377cfe40 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-service.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-service.yaml @@ -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" diff --git a/charts/opentelemetry-ebpf/templates/k8s-collector-deployment.yaml b/charts/opentelemetry-ebpf/templates/k8s-collector-deployment.yaml index 9234b5d2a..8ba2a84dd 100644 --- a/charts/opentelemetry-ebpf/templates/k8s-collector-deployment.yaml +++ b/charts/opentelemetry-ebpf/templates/k8s-collector-deployment.yaml @@ -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 }} diff --git a/charts/opentelemetry-ebpf/templates/kernel-collector-daemonset.yaml b/charts/opentelemetry-ebpf/templates/kernel-collector-daemonset.yaml index 01505798f..ed3764403 100644 --- a/charts/opentelemetry-ebpf/templates/kernel-collector-daemonset.yaml +++ b/charts/opentelemetry-ebpf/templates/kernel-collector-daemonset.yaml @@ -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 }} diff --git a/charts/opentelemetry-ebpf/templates/reducer-deployment.yaml b/charts/opentelemetry-ebpf/templates/reducer-deployment.yaml index 6a704aa49..6e4b625a0 100644 --- a/charts/opentelemetry-ebpf/templates/reducer-deployment.yaml +++ b/charts/opentelemetry-ebpf/templates/reducer-deployment.yaml @@ -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: From 110c529f8ee74ab1ccd98e8c2c7990dc4b687b21 Mon Sep 17 00:00:00 2001 From: "Yang, Robin" Date: Sat, 24 Aug 2024 19:47:18 +0800 Subject: [PATCH 08/10] feat: grant ebpf k8s collector job watching permission. Signed-off-by: Yang, Robin --- charts/opentelemetry-ebpf/Chart.yaml | 2 +- .../rendered/cloud-collector-deployment.yaml | 2 +- .../rendered/cloud-collector-serviceaccount.yaml | 2 +- .../examples/cloud-collector/rendered/configmap.yaml | 2 +- .../rendered/k8s-collector-clusterrole.yaml | 10 +++++++++- .../rendered/k8s-collector-clusterrolebinding.yaml | 2 +- .../rendered/k8s-collector-deployment.yaml | 4 ++-- .../rendered/k8s-collector-serviceaccount.yaml | 2 +- .../rendered/kernel-collector-clusterrole.yaml | 2 +- .../rendered/kernel-collector-clusterrolebinding.yaml | 2 +- .../rendered/kernel-collector-daemonset.yaml | 4 ++-- .../rendered/kernel-collector-serviceaccount.yaml | 2 +- .../cloud-collector/rendered/reducer-deployment.yaml | 2 +- .../cloud-collector/rendered/reducer-service.yaml | 2 +- .../templates/k8s-collector-clusterrole.yaml | 8 ++++++++ 15 files changed, 32 insertions(+), 16 deletions(-) diff --git a/charts/opentelemetry-ebpf/Chart.yaml b/charts/opentelemetry-ebpf/Chart.yaml index ac74918be..e58bb8ccf 100644 --- a/charts/opentelemetry-ebpf/Chart.yaml +++ b/charts/opentelemetry-ebpf/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: opentelemetry-ebpf -version: 0.1.3 +version: 0.1.4 description: OpenTelemetry eBPF Helm chart for Kubernetes type: application home: https://opentelemetry.io/ diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-deployment.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-deployment.yaml index 5a28ec17b..28d5cab9a 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-deployment.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-deployment.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: example-opentelemetry-ebpf-cloud-collector labels: - helm.sh/chart: opentelemetry-ebpf-0.1.3 + helm.sh/chart: opentelemetry-ebpf-0.1.4 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.2" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-serviceaccount.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-serviceaccount.yaml index 43ddf8cd2..31a002e48 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-serviceaccount.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/cloud-collector-serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-opentelemetry-ebpf-cloud-collector labels: - helm.sh/chart: opentelemetry-ebpf-0.1.3 + helm.sh/chart: opentelemetry-ebpf-0.1.4 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.2" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/configmap.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/configmap.yaml index 0ce234f4d..91a84a3da 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/configmap.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/configmap.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-opentelemetry-ebpf-config labels: - helm.sh/chart: opentelemetry-ebpf-0.1.3 + helm.sh/chart: opentelemetry-ebpf-0.1.4 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.2" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrole.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrole.yaml index e8d9c29a0..7aec573f9 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrole.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrole.yaml @@ -5,7 +5,7 @@ kind: ClusterRole metadata: name: example-opentelemetry-ebpf-k8s-collector labels: - helm.sh/chart: opentelemetry-ebpf-0.1.3 + helm.sh/chart: opentelemetry-ebpf-0.1.4 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.2" @@ -27,3 +27,11 @@ rules: - get - list - watch +- apiGroups: + - "batch" + resources: + - jobs + verbs: + - get + - list + - watch diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrolebinding.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrolebinding.yaml index 098f17d84..6372b6e25 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrolebinding.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-clusterrolebinding.yaml @@ -5,7 +5,7 @@ kind: ClusterRoleBinding metadata: name: example-opentelemetry-ebpf-k8s-collector labels: - helm.sh/chart: opentelemetry-ebpf-0.1.3 + helm.sh/chart: opentelemetry-ebpf-0.1.4 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.2" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-deployment.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-deployment.yaml index 7fd5ac416..4d067717e 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-deployment.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-deployment.yaml @@ -10,7 +10,7 @@ kind: Deployment metadata: name: example-opentelemetry-ebpf-k8s-collector labels: - helm.sh/chart: opentelemetry-ebpf-0.1.3 + helm.sh/chart: opentelemetry-ebpf-0.1.4 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.2" @@ -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.3 + charts.flowmill.com/version: 0.1.4 labels: app.kubernetes.io/name: example-opentelemetry-ebpf-k8s-collector app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-serviceaccount.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-serviceaccount.yaml index 2caeeecf8..46e87c537 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-serviceaccount.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/k8s-collector-serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-opentelemetry-ebpf-k8s-collector labels: - helm.sh/chart: opentelemetry-ebpf-0.1.3 + helm.sh/chart: opentelemetry-ebpf-0.1.4 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.2" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrole.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrole.yaml index 81bc77fd3..f9a5bf6c6 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrole.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrole.yaml @@ -5,7 +5,7 @@ kind: ClusterRole metadata: name: example-opentelemetry-ebpf-kernel-collector labels: - helm.sh/chart: opentelemetry-ebpf-0.1.3 + helm.sh/chart: opentelemetry-ebpf-0.1.4 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.2" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrolebinding.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrolebinding.yaml index 3adc5106a..7ba924070 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrolebinding.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-clusterrolebinding.yaml @@ -5,7 +5,7 @@ kind: ClusterRoleBinding metadata: name: example-opentelemetry-ebpf-kernel-collector labels: - helm.sh/chart: opentelemetry-ebpf-0.1.3 + helm.sh/chart: opentelemetry-ebpf-0.1.4 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.2" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-daemonset.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-daemonset.yaml index 271e3b4b8..68a5d37e6 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-daemonset.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-daemonset.yaml @@ -9,7 +9,7 @@ kind: DaemonSet metadata: name: example-opentelemetry-ebpf-kernel-collector labels: - helm.sh/chart: opentelemetry-ebpf-0.1.3 + helm.sh/chart: opentelemetry-ebpf-0.1.4 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.2" @@ -22,7 +22,7 @@ spec: template: metadata: annotations: - charts.flowmill.com/version: 0.1.3 + charts.flowmill.com/version: 0.1.4 labels: app.kubernetes.io/name: example-opentelemetry-ebpf-kernel-collector app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-serviceaccount.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-serviceaccount.yaml index f9c220abc..0c5000bb1 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-serviceaccount.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/kernel-collector-serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-opentelemetry-ebpf-kernel-collector labels: - helm.sh/chart: opentelemetry-ebpf-0.1.3 + helm.sh/chart: opentelemetry-ebpf-0.1.4 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.2" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-deployment.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-deployment.yaml index ef95c0b18..3d8efcafc 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-deployment.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-deployment.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: example-opentelemetry-ebpf-reducer labels: - helm.sh/chart: opentelemetry-ebpf-0.1.3 + helm.sh/chart: opentelemetry-ebpf-0.1.4 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.2" diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-service.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-service.yaml index a377cfe40..3c9fd19e3 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-service.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-service.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-opentelemetry-ebpf-reducer labels: - helm.sh/chart: opentelemetry-ebpf-0.1.3 + helm.sh/chart: opentelemetry-ebpf-0.1.4 app.kubernetes.io/name: opentelemetry-ebpf app.kubernetes.io/instance: example app.kubernetes.io/version: "v0.10.2" diff --git a/charts/opentelemetry-ebpf/templates/k8s-collector-clusterrole.yaml b/charts/opentelemetry-ebpf/templates/k8s-collector-clusterrole.yaml index 1a4641174..5c60eb57f 100644 --- a/charts/opentelemetry-ebpf/templates/k8s-collector-clusterrole.yaml +++ b/charts/opentelemetry-ebpf/templates/k8s-collector-clusterrole.yaml @@ -22,4 +22,12 @@ rules: - get - list - watch +- apiGroups: + - "batch" + resources: + - jobs + verbs: + - get + - list + - watch {{- end -}} From 323ff8545f224c2acd389f68430d14265347a10d Mon Sep 17 00:00:00 2001 From: "Yang, Robin" Date: Fri, 20 Sep 2024 14:51:27 +0800 Subject: [PATCH 09/10] feat: grant ebpf k8s collector job watching permission. Signed-off-by: Yang, Robin --- .../examples/cloud-collector/rendered/reducer-service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-service.yaml b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-service.yaml index f25ed3d71..3c9fd19e3 100644 --- a/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-service.yaml +++ b/charts/opentelemetry-ebpf/examples/cloud-collector/rendered/reducer-service.yaml @@ -16,7 +16,7 @@ spec: app.kubernetes.io/name: example-opentelemetry-ebpf-reducer app.kubernetes.io/instance: example ports: - + - name: stats port: 7001 targetPort: 7001 From ac631213cdf3f2bddc91519687396636f816296d Mon Sep 17 00:00:00 2001 From: "Yang, Robin" Date: Mon, 23 Sep 2024 15:31:29 +0800 Subject: [PATCH 10/10] feat: grant ebpf k8s collector job watching permission. Signed-off-by: Yang, Robin --- charts/opentelemetry-ebpf/ci/enabled-log-debug-values.yaml | 2 +- .../opentelemetry-ebpf/templates/k8s-collector-deployment.yaml | 2 +- .../templates/kernel-collector-daemonset.yaml | 2 +- charts/opentelemetry-ebpf/templates/reducer-deployment.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/opentelemetry-ebpf/ci/enabled-log-debug-values.yaml b/charts/opentelemetry-ebpf/ci/enabled-log-debug-values.yaml index 510b1094b..4173baf60 100644 --- a/charts/opentelemetry-ebpf/ci/enabled-log-debug-values.yaml +++ b/charts/opentelemetry-ebpf/ci/enabled-log-debug-values.yaml @@ -10,4 +10,4 @@ log: debug: enabled: true storeMinidump: true - sendUnplannedExitMetric: true + sendUnplannedExitMetric: false diff --git a/charts/opentelemetry-ebpf/templates/k8s-collector-deployment.yaml b/charts/opentelemetry-ebpf/templates/k8s-collector-deployment.yaml index 8ba2a84dd..9234b5d2a 100644 --- a/charts/opentelemetry-ebpf/templates/k8s-collector-deployment.yaml +++ b/charts/opentelemetry-ebpf/templates/k8s-collector-deployment.yaml @@ -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 | quote }} + value: {{ .Values.endpoint.port }} {{- end }} {{- if .Values.k8sCollector.relay.env }} {{ toYaml .Values.k8sCollector.relay.env | indent 10 }} diff --git a/charts/opentelemetry-ebpf/templates/kernel-collector-daemonset.yaml b/charts/opentelemetry-ebpf/templates/kernel-collector-daemonset.yaml index ed3764403..01505798f 100644 --- a/charts/opentelemetry-ebpf/templates/kernel-collector-daemonset.yaml +++ b/charts/opentelemetry-ebpf/templates/kernel-collector-daemonset.yaml @@ -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 | quote }} + value: {{ .Values.endpoint.port }} {{- end }} {{- if .Values.kernelCollector.env }} {{ toYaml .Values.kernelCollector.env | indent 12 }} diff --git a/charts/opentelemetry-ebpf/templates/reducer-deployment.yaml b/charts/opentelemetry-ebpf/templates/reducer-deployment.yaml index 6e4b625a0..6a704aa49 100644 --- a/charts/opentelemetry-ebpf/templates/reducer-deployment.yaml +++ b/charts/opentelemetry-ebpf/templates/reducer-deployment.yaml @@ -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 | quote }} + value: {{ .Values.endpoint.port }} {{- end }} {{- end }} ports: