From a230543ac96310f9666353ccef31476c2eba7809 Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Fri, 23 Aug 2024 15:20:01 -0700 Subject: [PATCH 1/2] docs: one too many jacobs (#1315) --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 24c8119df..dec7d8124 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,6 @@ See [CONTRIBUTING.md](./CONTRIBUTING.md). Approvers ([@open-telemetry/helm-approvers](https://github.com/orgs/open-telemetry/teams/helm-approvers)): - [Alex Birca](https://github.com/Allex1), Adobe -- [Jacob Aronoff](https://github.com/jaronoff97), ServiceNow - [Jared Tan](https://github.com/JaredTan95), DaoCloud - [Pierre Tessier](https://github.com/puckpuck), Honeycomb - [Povilas](https://github.com/povilasv), Coralogix From 7f64f3fad27888839cdf0059b597b5d5f688e318 Mon Sep 17 00:00:00 2001 From: hyfj44255 Date: Tue, 27 Aug 2024 10:58:22 +0800 Subject: [PATCH 2/2] test: Add CI scenarios for eBPF Chart. #964 (#1310) --- 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 +- 16 files changed, 92 insertions(+), 16 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 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/ci/enabled-log-debug-values.yaml b/charts/opentelemetry-ebpf/ci/enabled-log-debug-values.yaml new file mode 100644 index 000000000..4173baf60 --- /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: false 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..df31e90dc --- /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" 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"