feat(apm): add on-demand SSI for Cluster Agent - #3372
Draft
iamluc wants to merge 1 commit into
Draft
Conversation
Expose instrumentation.onDemand (default true) and set DD_APM_INSTRUMENTATION_ON_DEMAND so APM_POLICIES Remote Config works without cluster-wide SSI, matching Helm and Agent defaults.
|
🎯 Code Coverage (details) 🔗 Commit SHA: 936051e | Docs | View more details | Give us feedback! |
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
1 participant
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.
Description
On-demand SSI policies are delivered over Remote Config (
APM_POLICIES). TheCluster Agent subscribes to that product when
apm_config.instrumentation.on_demandis true (Agent default), but the Operator did not expose that setting or set
DD_APM_INSTRUMENTATION_ON_DEMANDon the Cluster Agent.This PR:
spec.features.apm.instrumentation.onDemand(defaulttrue, matching the Agent and Helm chart)DD_APM_INSTRUMENTATION_ON_DEMANDon the Cluster Agent from that valuedatadog.apm.instrumentation.onDemandin yaml-mapperUnlike helm-charts#2868, Remote Configuration is already enabled on the Cluster Agent by default (
features.remoteConfiguration.enabled=true). This change does not gateDD_REMOTE_CONFIGURATION_ENABLED.With Operator defaults (APM, admission controller, Remote Config, and
onDemandall true; cluster-wide SSI off), the Cluster Agent is configured for annotation- and RC-based workload selection without enabling cluster-wide injection.Related Issue
Counterpart of DataDog/helm-charts#2868
Follow-up to SSI on-demand RC E2E work in datadog-agent.
Type of Change
Checklist
How Has This Been Tested?
go test ./internal/controller/datadogagent/feature/apm/ ./internal/controller/datadogagent/defaults/ ./api/datadoghq/v2alpha1/make generate && make manifestsmake golden-update(Cluster Agent goldens now includeDD_APM_INSTRUMENTATION_ON_DEMAND=true)Minimum Agent Versions
apm_config.instrumentation.on_demand/APM_POLICIES)The Operator currently pins Cluster Agent
7.81.1. Extra env vars are ignored on older images; policies start working once the Cluster Agent image is 7.83+.Additional Notes
Default DDA install after this PR:
DD_REMOTE_CONFIGURATION_ENABLED=true(already the Operator default)DD_APM_INSTRUMENTATION_ENABLED=falseDD_APM_INSTRUMENTATION_ON_DEMAND=true