From 2940e0318e5e38bfb8b1c7a4d50e93b099bdc0f6 Mon Sep 17 00:00:00 2001 From: Kartik Pattaswamy Date: Mon, 19 Aug 2024 21:26:49 +0000 Subject: [PATCH 1/2] add the eBPF agent chart to the nri bundle Signed-off-by: Kartik Pattaswamy --- .github/workflows/post-release-nri-bundle.yml | 1 + .github/workflows/release.yml | 1 + charts/nri-bundle/Chart.yaml | 8 +++++++- charts/nri-bundle/values.yaml | 3 +++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/post-release-nri-bundle.yml b/.github/workflows/post-release-nri-bundle.yml index bce05af6d..730e49351 100644 --- a/.github/workflows/post-release-nri-bundle.yml +++ b/.github/workflows/post-release-nri-bundle.yml @@ -42,6 +42,7 @@ jobs: helm repo add kube-state-metrics https://kubernetes.github.io/kube-state-metrics helm repo add newrelic-cdn-helm-charts https://helm-charts.newrelic.com helm repo add k8s-agents-operator https://newrelic.github.io/k8s-agents-operator + helm repo add nr-ebpf-agent https://newrelic.github.io/nr-ebpf-agent - name: Create release notes env: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f9c4678bf..f0a94cf8e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -59,6 +59,7 @@ jobs: helm repo add prometheus-community https://prometheus-community.github.io/helm-charts helm repo add flux2 https://fluxcd-community.github.io/helm-charts helm repo add k8s-agents-operator https://newrelic.github.io/k8s-agents-operator + helm repo add nr-ebpf-agent https://newrelic.github.io/nr-ebpf-agent - name: Configure Git run: | diff --git a/charts/nri-bundle/Chart.yaml b/charts/nri-bundle/Chart.yaml index ff758c601..1ea2fcb2f 100644 --- a/charts/nri-bundle/Chart.yaml +++ b/charts/nri-bundle/Chart.yaml @@ -16,8 +16,9 @@ sources: - https://github.com/newrelic/helm-charts/tree/master/charts/newrelic-pixie - https://github.com/newrelic/newrelic-infra-operator/tree/master/charts/newrelic-infra-operator - https://github.com/newrelic/k8s-agents-operator/tree/master/charts/k8s-agents-operator + - https://github.com/newrelic/helm-charts/tree/master/charts/nr-ebpf-agent -version: 5.0.89 +version: 5.0.90 dependencies: - name: newrelic-infrastructure @@ -84,6 +85,11 @@ dependencies: condition: newrelic-infra-operator.enabled version: 2.11.1 + - name: nr-ebpf-agent + repository: https://newrelic.github.io/nr-ebpf-agent + condition: nr-ebpf-agent.enabled + version: 0.1.3 + maintainers: - name: juanjjaramillo url: https://github.com/juanjjaramillo diff --git a/charts/nri-bundle/values.yaml b/charts/nri-bundle/values.yaml index 47c58df8e..6655bd330 100644 --- a/charts/nri-bundle/values.yaml +++ b/charts/nri-bundle/values.yaml @@ -49,6 +49,9 @@ newrelic-k8s-metrics-adapter: # newrelic-k8s-metrics-adapter.enabled -- Install the [`newrelic-k8s-metrics-adapter.` chart](https://github.com/newrelic/newrelic-k8s-metrics-adapter/tree/main/charts/newrelic-k8s-metrics-adapter) (Beta) enabled: false +nr-ebpf-agent: + # nr-ebpf-agent.enabled -- Install the [`nr-ebpf-agent` chart](https://github.com/newrelic/helm-charts/tree/master/charts/nr-ebpf-agent) + enabled: false # -- change the behaviour globally to all the supported helm charts. # See [user's guide of the common library](https://github.com/newrelic/helm-charts/blob/master/library/common-library/README.md) for further information. From 116a082eaab165bf927b1ab509b6ba73c8d429bf Mon Sep 17 00:00:00 2001 From: Kartik Pattaswamy Date: Tue, 20 Aug 2024 16:33:41 +0000 Subject: [PATCH 2/2] Update readme & gh workflows Signed-off-by: Kartik Pattaswamy --- .github/ct-install.yaml | 1 + .github/ct-lint.yaml | 1 + charts/nri-bundle/Chart.yaml | 2 +- charts/nri-bundle/README.md | 2 ++ charts/nri-bundle/README.md.gotmpl | 2 +- 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/ct-install.yaml b/.github/ct-install.yaml index 53d3ecfd4..ef0fffcc1 100644 --- a/.github/ct-install.yaml +++ b/.github/ct-install.yaml @@ -29,3 +29,4 @@ chart-repos: - prometheus-community=https://prometheus-community.github.io/helm-charts - fluxcd-community=https://fluxcd-community.github.io/helm-charts - k8s-agents-operator=https://newrelic.github.io/k8s-agents-operator + - nr-ebpf-agent=https://newrelic.github.io/nr-ebpf-agent \ No newline at end of file diff --git a/.github/ct-lint.yaml b/.github/ct-lint.yaml index 7588598d4..8630c268a 100644 --- a/.github/ct-lint.yaml +++ b/.github/ct-lint.yaml @@ -29,3 +29,4 @@ chart-repos: - prometheus-community=https://prometheus-community.github.io/helm-charts - fluxcd-community=https://fluxcd-community.github.io/helm-charts - k8s-agents-operator=https://newrelic.github.io/k8s-agents-operator + - nr-ebpf-agent=https://newrelic.github.io/nr-ebpf-agent diff --git a/charts/nri-bundle/Chart.yaml b/charts/nri-bundle/Chart.yaml index 1ea2fcb2f..1f6888fe9 100644 --- a/charts/nri-bundle/Chart.yaml +++ b/charts/nri-bundle/Chart.yaml @@ -18,7 +18,7 @@ sources: - https://github.com/newrelic/k8s-agents-operator/tree/master/charts/k8s-agents-operator - https://github.com/newrelic/helm-charts/tree/master/charts/nr-ebpf-agent -version: 5.0.90 +version: 5.0.91 dependencies: - name: newrelic-infrastructure diff --git a/charts/nri-bundle/README.md b/charts/nri-bundle/README.md index 3fcc97d2b..17359fb04 100644 --- a/charts/nri-bundle/README.md +++ b/charts/nri-bundle/README.md @@ -26,6 +26,7 @@ here is a list of components that this chart installs and where you can find mor | [newrelic-pixie](https://github.com/newrelic/helm-charts/tree/master/charts/newrelic-pixie) | | Connects to the Pixie API and enables the New Relic plugin in Pixie. The plugin allows you to export data from Pixie to New Relic for long-term data retention. | | [Pixie](https://docs.pixielabs.ai/installing-pixie/install-schemes/helm/#3.-deploy) | | Is an open source observability tool for Kubernetes applications that uses eBPF to automatically capture telemetry data without the need for manual instrumentation. | | [k8s-agents-operator](https://github.com/newrelic/k8s-agents-operator/tree/main/charts/k8s-agents-operator) | | (Preview) Streamlines full-stack observability for Kubernetes environments by automating APM instrumentation alongside Kubernetes agent deployment. | +| [nr-ebpf-agent](https://github.com/newrelic/helm-charts/tree/master/charts/nr-ebpf-agent) | | (Preview) Provides a zero instrumentation APM-lite experience for Kubernetes environments. | ## Configure components @@ -188,6 +189,7 @@ Note, the value table below is automatically generated from `values.yaml` by `he | newrelic-logging.enabled | bool | `false` | Install the [`newrelic-logging` chart](https://github.com/newrelic/helm-charts/tree/master/charts/newrelic-logging) | | newrelic-pixie.enabled | bool | `false` | Install the [`newrelic-pixie`](https://github.com/newrelic/helm-charts/tree/master/charts/newrelic-pixie) | | newrelic-prometheus-agent.enabled | bool | `false` | Install the [`newrelic-prometheus-agent` chart](https://github.com/newrelic/newrelic-prometheus-configurator/tree/main/charts/newrelic-prometheus-agent) | +| nr-ebpf-agent.enabled | bool | `false` | Install the [`nr-ebpf-agent` chart](https://github.com/newrelic/helm-charts/tree/master/charts/nr-ebpf-agent) | | nri-kube-events.enabled | bool | `false` | Install the [`nri-kube-events` chart](https://github.com/newrelic/nri-kube-events/tree/main/charts/nri-kube-events) | | nri-metadata-injection.enabled | bool | `true` | Install the [`nri-metadata-injection` chart](https://github.com/newrelic/k8s-metadata-injection/tree/main/charts/nri-metadata-injection) | | nri-prometheus.enabled | bool | `false` | Install the [`nri-prometheus` chart](https://github.com/newrelic/nri-prometheus/tree/main/charts/nri-prometheus) | diff --git a/charts/nri-bundle/README.md.gotmpl b/charts/nri-bundle/README.md.gotmpl index 269c4925a..d4c8116c2 100644 --- a/charts/nri-bundle/README.md.gotmpl +++ b/charts/nri-bundle/README.md.gotmpl @@ -27,7 +27,7 @@ here is a list of components that this chart installs and where you can find mor | [newrelic-pixie](https://github.com/newrelic/helm-charts/tree/master/charts/newrelic-pixie) | | Connects to the Pixie API and enables the New Relic plugin in Pixie. The plugin allows you to export data from Pixie to New Relic for long-term data retention. | | [Pixie](https://docs.pixielabs.ai/installing-pixie/install-schemes/helm/#3.-deploy) | | Is an open source observability tool for Kubernetes applications that uses eBPF to automatically capture telemetry data without the need for manual instrumentation. | | [k8s-agents-operator](https://github.com/newrelic/k8s-agents-operator/tree/main/charts/k8s-agents-operator) | | (Preview) Streamlines full-stack observability for Kubernetes environments by automating APM instrumentation alongside Kubernetes agent deployment. | - +| [nr-ebpf-agent](https://github.com/newrelic/helm-charts/tree/master/charts/nr-ebpf-agent) | | (Preview) Provides a zero instrumentation APM-lite experience for Kubernetes environments. | ## Configure components It is possible to configure settings for the individual charts this chart groups by specifying values for them under a key using the name of the chart,