[nr-ebpf-agent] Changes for removing OTEL collector (#2015)

<!--
Thank you for contributing to New Relic's Helm charts. Before you submit
this PR we'd like to
make sure you are aware of our technical requirements:

*
https://github.com/newrelic-experimental/helm-charts/blob/master/CONTRIBUTING.md#technical-requirements

For a quick overview across what we will look at reviewing your PR,
please read
our review guidelines:

*
https://github.com/newrelic-experimental/helm-charts/blob/master/REVIEW_GUIDELINES.md

Following our best practices right from the start will accelerate the
review process and
help get your PR merged quicker.

When updates to your PR are requested, please add new commits and do not
squash the
history. This will make it easier to identify new changes. The PR will
be squashed
anyways when it is merged. Thanks.

For fast feedback, please @-mention maintainers that are listed in the
Chart.yaml file.

Please make sure you test your changes before you push them. Once
pushed, a Github Action
will run across your changes and do some initial checks and linting.
These checks run
very quickly. Please check the results. We would like these checks to
pass before we
even continue reviewing your changes.
-->
#### Is this a new chart
No

#### What this PR does / why we need it:
This PR contains changes related to OTEL pod removal from eBPF agent
helm chart.

#### Which issue this PR fixes
*(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)`
format, will close that issue when PR gets merged)*
  - fixes #

#### Special notes for your reviewer:

#### Checklist
[Place an '[x]' (no spaces) in all applicable fields. Please remove
unrelated fields.]
- [x] Chart Version bumped
- [x] Variables are documented in the README.md
- [x] Title of the PR starts with chart name (e.g. `[mychartname]`)

# Release Notes to Publish (nr-k8s-otel-collector)
If this PR contains changes in `nr-k8s-otel-collector`, please complete
the following section. All other charts should ignore this section.

<!--BEGIN-RELEASE-NOTES-->
## 🚀 What's Changed
* Tell the world about the latest changes in the chart.
<!--END-RELEASE-NOTES-->

---------

Co-authored-by: kkhandelwal <[email protected]>

Author: burhan-nr

charts/nr-ebpf-agent/Chart.yaml

@@ -13,7 +13,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.5.0
+version: 1.0.0
 
 dependencies:
   - name: common-library
@@ -23,7 +23,7 @@ dependencies:
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.5.0"
+appVersion: "1.0.0"
 home: https://github.com/newrelic/helm-charts
 sources:
   - https://github.com/newrelic/

charts/nr-ebpf-agent/README.md

@@ -22,6 +22,35 @@ helm repo add newrelic https://helm-charts.newrelic.com
 helm upgrade nr-ebpf-agent newrelic/nr-ebpf-agent -f your-custom-values.yaml -n newrelic --create-namespace --install
 ```
 
+## Version Compatibility
+
+Starting with chart version 1.0.0, version validation is automatically performed to ensure agent compatibility. Chart 1.0.0+ removed OpenTelemetry collector support and requires agent version >= 1.0.0.
+
+**Default Behavior:**
+When no custom image tag is specified, the chart uses `Chart.AppVersion` (1.0.0 for chart 1.0.0), which is guaranteed to be compatible.
+
+```yaml
+ebpfAgent:
+  image:
+    tag: ""  # Uses Chart.AppVersion (1.0.0)
+```
+
+**Custom Image Tag:**
+If you specify a custom image tag, ensure it contains an agent version >= 1.0.0:
+
+```yaml
+ebpfAgent:
+  image:
+    tag: "1.0.0"  # Or any version >= 1.0.0
+```
+
+### Troubleshooting Version Validation
+
+If you encounter version validation errors:
+
+1. **Check your image tag:** Ensure `ebpfAgent.image.tag` is set to a version >= 1.0.0
+2. **Use default version:** Remove the custom tag to use the chart's default version (recommended)
+
 ## Source Code
 
 * <https://github.com/newrelic/>
@@ -42,11 +71,6 @@ kubectl logs <ebpf-pod-name> -c nr-ebpf-client -n newrelic
 kubectl logs <ebpf-pod-name> -c nr-ebpf-agent -n newrelic
 ```
 
-### Check the logs of the OpenTelemetry collector pod:
-```
-kubectl logs <otel-pod-name> -n newrelic
-```
-
 ### Confirm data ingest to New Relic
 You should see data reporting into New Relic within a couple of seconds to the `Metric` and `Span` tables.
 ```
@@ -86,7 +110,6 @@ Options that can be defined globally include `affinity`, `nodeSelector`, `tolera
 | logFilePath | string | `""` | To configure log file path of eBPF Agent. If logging to this path fails, logs will be directed to stdout. |
 | dnsConfig | object | `{}` | Sets pod's dnsConfig. Can be configured also with `global.dnsConfig` |
 | dropAPMEnabledPods | bool | `false` | Drop data from pods that are monitored by New Relic APM via auto attach. |
-| dropDataIpServiceNames | bool | `true` | Drop data when service names map to an IP address. |
 | dropDataNewRelic | bool | `true` | Drop data from the newrelic namespace and newrelic-bundle services. |
 | dropDataForEntity | list | `[]` | list entity to ignore the process monitoring based on `NEW_RELIC_APP_NAME` |
 | dropDataForNamespaces | list | `[]` | List of Kubernetes namespaces for which all data should be dropped by the agent. |
@@ -113,19 +136,6 @@ Options that can be defined globally include `affinity`, `nodeSelector`, `tolera
 | licenseKey | string | `""` | The license key to use. Can be configured with `global.licenseKey` |
 | nodeSelector | object | `{}` | Sets all pods' node selector. Can be configured also with `global.nodeSelector` |
 | nrStaging | bool | `false` | Endpoint to export data to via the otel collector. NR prod (otlp.nr-data.net:443) by default. Staging (staging-otlp.nr-data.net:443) otherwise. |
-| otelCollector.affinity | object | `{}` | Sets otelCollector pod affinities. Overrides `affinity` and `global.affinity` |
-| otelCollector.collector.serviceAccount.annotations | object | `{}` | Annotations for the OTel collector service account. |
-| otelCollector.containerSecurityContext | object | `{}` | Sets otelCollector pod containerSecurityContext. Overrides `containerSecurityContext` and `global.securityContext.container` |
-| otelCollector.image.pullPolicy | string | `"IfNotPresent"` | The pull policy is defaulted to IfNotPresent, which skips pulling an image if it already exists. If pullPolicy is defined without a specific value, it is set to Always. |
-| otelCollector.image.repository | string | `"docker.io/newrelic/newrelic-ebpf-agent"` | OpenTelemetry collector image to be deployed. |
-| otelCollector.image.tag | string | `"nr-ebpf-otel-collector_0.0.1"` | The tag of the OpenTelemetry collector image to be deployed. |
-| otelCollector.podAnnotations | object | `{}` | Sets otelCollector pod Annotations. Overrides `podAnnotations` and `global.podAnnotations` |
-| otelCollector.podSecurityContext | object | `{}` | Sets otelCollector pod podSecurityContext. Overrides `podSecurityContext` and `global.securityContext.pod` |
-| otelCollector.resources.limits.cpu | string | `"100m"` | Max CPU allocated to the container. |
-| otelCollector.resources.limits.memory | string | `"200Mi"` | Max memory allocated to the container. |
-| otelCollector.resources.requests.cpu | string | `"100m"` | Min CPU allocated to the container. |
-| otelCollector.resources.requests.memory | string | `"200Mi"` | Min memory allocated to the container. |
-| otelCollector.tolerations | list | `[]` | Sets otelCollector pod tolerations. Overrides `tolerations` and `global.tolerations` |
 | podLabels | object | `{}` | Additional labels for chart pods. |
 | podSecurityContext | object | `{}` | Sets all pods' podSecurityContext. Can be configured also with `global.securityContext.pod` |
 | priorityClassName | string | `""` | Sets pod's priorityClassName. Can be configured also with `global.priorityClassName` |
@@ -169,7 +179,6 @@ Options that can be defined globally include `affinity`, `nodeSelector`, `tolera
 | tls.enabled | bool | `true` | Enable TLS communication between the eBPF client and agent. |
 | tls.keyFile | string | `""` | Path to your own PEM-encoded private key. |
 | tolerations | list | `[]` | Sets all pods' tolerations to node taints. Can be configured also with `global.tolerations` |
-| verboseLog | bool | `false` | Sets the debug logs to this integration or all integrations if it is set globally. Can be configured also with `global.verboseLog` |
 
 ## Common Errors
 

charts/nr-ebpf-agent/templates/_helpers.tpl

@@ -64,24 +64,60 @@ Create otel collector receiver endpoint
 
 {{/*
 Validates that user-provided tags don't contain "agent-" prefix for chart version >= 0.4.0
+Also validates agent version compatibility for chart version >= 1.0.0
 */}}
 {{- define "nr-ebpf-agent.imageTag" -}}
+{{- $imageTag := "" -}}
 {{- if .Values.ebpfAgent.image.tag -}}
   {{- if semverCompare ">=0.4.0" .Chart.Version -}}
     {{- if hasPrefix "agent-" .Values.ebpfAgent.image.tag -}}
       {{- fail (printf "Error: For chart version %s (>=0.4.0), the ebpfAgent.image.tag should not contain 'agent-' prefix. Please use image tags that do not contain the prefix." .Chart.Version) -}}
     {{- end -}}
-    {{- .Values.ebpfAgent.image.tag -}}
+    {{- $imageTag = .Values.ebpfAgent.image.tag -}}
   {{- else -}}
-    {{- .Values.ebpfAgent.image.tag -}}
+    {{- $imageTag = .Values.ebpfAgent.image.tag -}}
   {{- end -}}
 {{- else -}}
   {{- if semverCompare ">=0.4.0" .Chart.Version -}}
-    {{- .Chart.AppVersion -}}
+    {{- $imageTag = .Chart.AppVersion -}}
   {{- else -}}
-    {{- printf "agent-%s" .Chart.AppVersion -}}
+    {{- $imageTag = printf "agent-%s" .Chart.AppVersion -}}
   {{- end -}}
 {{- end -}}
+{{- if and (semverCompare ">=1.0.0" .Chart.Version) (not .Values.skipVersionValidation) -}}
+  {{- include "nr-ebpf-agent.validateVersion" (dict "tag" $imageTag "chartVersion" .Chart.Version "appVersion" .Chart.AppVersion) -}}
+{{- end -}}
+{{- $imageTag -}}
+{{- end -}}
+
+{{/*
+Validate agent version compatibility at template rendering time
+For chart version >= 1.0.0, ensure agent version >= 1.0.0
+Extracts version from image tag and compares using semver
+*/}}
+{{- define "nr-ebpf-agent.validateVersion" -}}
+{{- $tag := .tag -}}
+{{- $chartVersion := .chartVersion -}}
+{{- $appVersion := .appVersion -}}
+{{- $minVersion := "1.0.0" -}}
+{{- $agentVersion := "" -}}
+
+{{- /* Try to extract semantic version from tag */ -}}
+{{- if regexMatch "^v?[0-9]+\\.[0-9]+\\.[0-9]+" $tag -}}
+  {{- /* Extract X.Y.Z from patterns like "0.5.0", "v0.5.0", "0.5.0-beta", etc */ -}}
+  {{- $agentVersion = regexFind "^v?([0-9]+\\.[0-9]+\\.[0-9]+)" $tag | trimPrefix "v" -}}
+{{- else if eq $tag $appVersion -}}
+  {{- /* If tag equals appVersion, use appVersion directly */ -}}
+  {{- $agentVersion = $appVersion -}}
+{{- else -}}
+  {{- /* Cannot parse version from custom tag - fail with helpful message */ -}}
+  {{- fail (printf "\nError: Chart version %s requires agent version >= %s.\n\nCannot determine agent version from image tag '%s'.\n\nRESOLUTION:\n  1. Use a semantic version tag (e.g., '1.0.0', '0.7.0')\n  2. Remove the image tag to use Chart.AppVersion (%s)\n\nFor more information:\n  https://github.com/newrelic/helm-charts/tree/master/charts/nr-ebpf-agent\n" $chartVersion $minVersion $tag $appVersion) -}}
+{{- end -}}
+
+{{- /* Validate extracted version is >= minimum required version */ -}}
+{{- if not (semverCompare (printf ">=%s" $minVersion) $agentVersion) -}}
+  {{- fail (printf "\n================================================================================\nERROR: INCOMPATIBLE AGENT VERSION\n================================================================================\n\nChart Version:    %s\nAgent Version:    %s (from tag: %s)\nRequired Version: >= %s\n\nChart version %s removed OpenTelemetry collector support and requires\nagent version >= %s.\n\nRESOLUTION:\n  1. Update ebpfAgent.image.tag to version >= %s\n     OR\n  2. Remove custom image tag to use Chart.AppVersion (%s)\n\nFor more information:\n  https://github.com/newrelic/helm-charts/tree/master/charts/nr-ebpf-agent\n\n================================================================================\n" $chartVersion $agentVersion $tag $minVersion $chartVersion $minVersion $minVersion $appVersion) -}}
+{{- end -}}
 {{- end -}}
 
 {{/*

charts/nr-ebpf-agent/templates/nr-ebpf-agent-daemonset.yaml

@@ -1,4 +1,5 @@
 ---
+{{- $region := include "newrelic.common.region" . }}
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
@@ -129,7 +130,13 @@ spec:
               fieldRef:
                 fieldPath: status.hostIP
           - name: OTLP_ENDPOINT
-            value: {{ include "nr-otel-collector-receiver.endpoint" .}}
+        {{- if eq $region "Staging" }}
+            value: "staging-otlp.nr-data.net:443"
+        {{- else if eq $region "EU" }}
+            value: "otlp.eu01.nr-data.net:443"
+        {{- else }}
+            value: "otlp.nr-data.net:443"
+        {{- end }}
           {{- include "generateClientScriptEnvVars" . | nindent 10 }}
           {{- if (hasKey .Values.protocols.http "spans") }}
           {{- if .Values.protocols.http.spans.samplingErrorRate}}
@@ -142,12 +149,20 @@ spec:
             value: {{ .Release.Namespace }}
           - name: AGENT_SERVICE_NAME
             value: {{ include "nr-ebpf-agent.service.name" . }}
-          - name: IS_INSECURE
-            value: "True"
           - name: APM_DATA_REPORTING
             value: "{{ if hasKey .Values "apmDataReporting" }}{{ .Values.apmDataReporting }}{{ else }}true{{ end }}"
           - name: TCP_STATS_REPORTING
             value: "{{ if hasKey .Values "tcpStatsReporting" }}{{ .Values.tcpStatsReporting }}{{ else }}true{{ end }}"
+          - name: DROP_DATA_NEW_RELIC
+            value: "{{ if hasKey .Values "dropDataNewRelic" }}{{ .Values.dropDataNewRelic }}{{ else }}true{{ end }}"
+          - name: DROP_APM_ENABLED_PODS
+            value: "{{ if hasKey .Values "dropAPMEnabledPods" }}{{ .Values.dropAPMEnabledPods }}{{ else }}false{{ end }}"
+          - name: DROP_DATA_FOR_NAMESPACES
+            value: "{{ .Values.dropDataForNamespaces | join "," }}"
+          - name: DROP_SERVICE_NAME_REGEX
+            value: {{ .Values.dropDataServiceNameRegex }}
+          - name: ALLOW_SERVICE_NAME_REGEX
+            value: {{ .Values.allowServiceNameRegex }}
         securityContext:
           privileged: true
         volumeMounts:
@@ -168,6 +183,7 @@ spec:
       hostNetwork: true
       hostPID: true
       restartPolicy: Always
+      serviceAccountName: {{ include "nr-ebpf-agent.service.name" . }}
       volumes:
       - name: host-root-volume
         hostPath:

charts/nr-ebpf-agent/templates/otel-collector-rbac.yaml renamed to charts/nr-ebpf-agent/templates/nr-ebpf-agent-rbac.yaml

@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ include "nr-ebpf-agent.otelcollector.name" . }}
+  name: {{ include "nr-ebpf-agent.service.name" . }}
   labels:
     {{- include "newrelic.common.labels" . | nindent 4 }}
 rules:
@@ -29,14 +29,14 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: {{ include "nr-ebpf-agent.otelcollector.name" . }}
+  name: {{ include "nr-ebpf-agent.service.name" . }}
   labels:
     {{- include "newrelic.common.labels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ include "nr-ebpf-agent.otelcollector.name" . }}
+  name: {{ include "nr-ebpf-agent.service.name" . }}
 subjects:
 - kind: ServiceAccount
-  name: {{ include "nr-ebpf-agent.collector.name" . }}
+  name: {{ include "nr-ebpf-agent.service.name" . }}
   namespace: '{{ .Release.Namespace }}'

charts/nr-ebpf-agent/templates/otel-collector-service-account.yaml renamed to charts/nr-ebpf-agent/templates/nr-ebpf-agent-service-account.yaml

@@ -2,9 +2,9 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "nr-ebpf-agent.collector.name" . }}
+  name: {{ include "nr-ebpf-agent.service.name" . }}
   labels:
     {{- include "newrelic.common.labels" . | nindent 4 }}
   annotations:
-    {{- toYaml .Values.otelCollector.collector.serviceAccount.annotations | nindent 4 }}
+    {{- toYaml .Values.ebpfAgent.serviceAccount.annotations | nindent 4 }}
 {{- end }}