Do not set process-agent AppArmor for NPM fallback#3185
Merged
Conversation
This comment has been minimized.
This comment has been minimized.
brycekahle
approved these changes
Jun 23, 2026
khewonc
approved these changes
Jun 23, 2026
3 tasks
khewonc
pushed a commit
that referenced
this pull request
Jun 23, 2026
(cherry picked from commit 9903c3d) Co-authored-by: Timothée Bavelier <[email protected]>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Removes the
container.apparmor.security.beta.kubernetes.io/process-agent: unconfinedannotation added by the NPM/USM non-direct-send fallback path.process-agentis still created and configured when CNM/USM direct-send is disabled or unavailable, but onlysystem-probekeeps its existing AppArmor annotation.Motivation
The process-agent AppArmor annotation was introduced while enabling CNM direct-send by default: #3045. That changed the legacy fallback rendering even though this annotation was not previously emitted and the Helm chart does not add an AppArmor profile for
process-agent.On GKE Autopilot, the extra annotation causes the Datadog daemonset to be rejected by the WorkloadAllowlist because the allowlist does not permit a container-level AppArmor profile for
process-agent.Additional Notes
This is intentionally not an Autopilot-specific workaround. It restores the previous operator behavior for process-agent while keeping the existing system-probe AppArmor behavior unchanged.
Minimum Agent Versions
Are there minimum versions of the Datadog Agent and/or Cluster Agent required?
Describe your test plan
go test ./internal/controller/datadogagent/feature/npm ./internal/controller/datadogagent/feature/usm ./internal/controller/datadogagent/feature/...Checklist
bug,enhancement,refactoring,documentation,tooling, and/ordependenciesqa/skip-qalabel