Skip to content

nr-ebpf-agent: Add Comprehensive Global Value Inheritance Test Coverage #2021

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+508 −21
Open

nr-ebpf-agent: Add Comprehensive Global Value Inheritance Test Coverage #2021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5efd4d7
feat(nr-ebpf-agent): add comprehensive global value inheritance test …
dpacheconr Nov 28, 2025
4fbe30f
fix(nr-ebpf-agent): fix 4 pre-existing test failures
dpacheconr Dec 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/nr-ebpf-agent/templates/nr-ebpf-agent-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ spec:

containers:
- name: nr-ebpf-agent
image: {{ .Values.ebpfAgent.image.repository }}:{{ include "nr-ebpf-agent.imageTag" . }}
image: {{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.ebpfAgent.image "defaultRegistry" "docker.io" "context" .) }}
imagePullPolicy: {{ .Values.ebpfAgent.image.pullPolicy }}
resources: {{ .Values.ebpfAgent.resources | toYaml | nindent 10 }}
env:
Expand Down
34 changes: 17 additions & 17 deletions charts/nr-ebpf-agent/templates/otel-collector-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
component: otel-collector
{{- include "newrelic.common.labels.podLabels" . | nindent 8 }}
annotations:
checksum/config: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
checksum/config: ""
{{- with .Values.otelCollector.podAnnotations }}
{{- toYaml . | nindent 8 }}
{{- end }}
Expand All @@ -47,16 +47,12 @@ spec:
securityContext:
{{- . | nindent 12 }}
{{- end }}
image: {{ if .Values.otelCollector.image.tag -}}
{{ .Values.otelCollector.image.repository }}:{{ .Values.otelCollector.image.tag }}
{{ else -}}
{{ .Values.otelCollector.image.repository }}:nr-ebpf-otel-collector_0.0.1
{{ end -}}
image: {{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.otelCollector.image "defaultRegistry" "docker.io" "context" .) }}
imagePullPolicy: {{ .Values.otelCollector.image.pullPolicy }}
resources: {{- toYaml .Values.otelCollector.resources | nindent 10}}
ports:
- name: otlp
containerPort: {{ .Values.otelCollector.receiverPort }}
containerPort: 4317
protocol: TCP
volumeMounts:
- name: data
Expand All @@ -81,9 +77,6 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: status.podIP
{{- include "validate.receiverPort" . }}
- name: RECEIVER_PORT
value: "{{ .Values.otelCollector.receiverPort }}"
- name: NEW_RELIC_LICENSE_KEY
valueFrom:
secretKeyRef:
Expand All @@ -97,18 +90,25 @@ spec:
- name: FILTER_NAMESPACE_REGEX
value: '^({{ .Values.dropDataForNamespaces | join "|" }})$'
- name: OTLP_ENDPOINT
{{- if eq $region "Staging" }}
value: "staging-otlp.nr-data.net:443"
{{- if and .Values.global .Values.global.fedramp .Values.global.fedramp.enabled }}
value: "gov-otlp.nr-data.net:4317"
{{- else if eq $region "Staging" }}
value: "staging-otlp.nr-data.net:4317"
{{- else if eq $region "EU" }}
value: "otlp.eu01.nr-data.net:443"
value: "otlp.eu01.nr-data.net:4317"
{{- else }}
value: "otlp.nr-data.net:443"
value: "otlp.nr-data.net:4317"
{{- end }}
{{- if .Values.proxy }}
{{- $globalProxy := "" }}
{{- if .Values.global }}
{{- $globalProxy = .Values.global.proxy | default "" }}
{{- end }}
{{- $proxy := .Values.proxy | default $globalProxy | default "" }}
{{- if $proxy }}
- name: http_proxy
value: "{{- .Values.proxy }}"
value: {{ $proxy | quote }}
- name: https_proxy
value: "{{- .Values.proxy }}"
value: {{ $proxy | quote }}
{{- end }}
- name: CLUSTER_NAME
valueFrom:
Expand Down
14 changes: 13 additions & 1 deletion charts/nr-ebpf-agent/templates/otel-collector-service-account.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,18 @@ metadata:
name: {{ include "nr-ebpf-agent.collector.name" . }}
labels:
{{- include "newrelic.common.labels" . | nindent 4 }}
{{- $globalAnnotations := dict -}}
{{- if .Values.global -}}
{{- if .Values.global.serviceAccount -}}
{{- if .Values.global.serviceAccount.annotations -}}
{{- $globalAnnotations = .Values.global.serviceAccount.annotations -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{- $localAnnotations := .Values.otelCollector.collector.serviceAccount.annotations | default dict -}}
{{- $mergedAnnotations := mustMergeOverwrite $globalAnnotations $localAnnotations -}}
{{- if $mergedAnnotations }}
annotations:
{{- toYaml .Values.otelCollector.collector.serviceAccount.annotations | nindent 4 }}
{{- toYaml $mergedAnnotations | nindent 4 }}
{{- end }}
{{- end }}
Loading