feat(csi): support private APM registries - #3345
Merged
gh-worker-dd-mergequeue-cf854d[bot] merged 5 commits intoAug 19, 2026
Merged
Conversation
Pass dockerconfigjson credentials to the CSI driver for SSI library downloads, aligned with the Helm chart, and bump the default image to 1.4.0. Expose the setting on DatadogAgent so managed CSI installs can configure it without editing the DatadogCSIDriver CR.
|
🎯 Code Coverage (details) 🔗 Commit SHA: 7952c10 | Docs | Datadog PR Page | Give us feedback! |
Replace ptr.To(...) with new(...) for SecretKeyRef.Optional so golangci-lint modernize passes on Go 1.26.
Keep only datadog-csi-driver.apm.pullSecrets, which is the real subchart value path used by Helm installs.
clreaume
approved these changes
Aug 13, 2026
Env-only DD_UNTAINT_* was overridden by the chart's -untaintControllerEnabled=false CLI flag, so the suite never injected the startup toleration.
Mathew-Estafanous
approved these changes
Aug 18, 2026
gh-worker-dd-devflow-36fce6
Bot
added
mergequeue-status: queued
mergequeue-status: in_progress
and removed
mergequeue-status: queued
labels
gh-worker-dd-mergequeue-cf854d
Bot
deleted the
luc/csi-private-registry-auth
branch
August 19, 2026 07:49
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
3 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.
Description
Wire private registry authentication for SSI library downloads through the Operator-managed CSI driver, aligned with the Helm chart (
DD_APM_REGISTRY_AUTH_*viasecretKeyRefon.dockerconfigjson).spec.global.csi.apm.pullSecretsonDatadogAgentand propagate it to the managedDatadogCSIDriverspec.apm.pullSecretsonDatadogCSIDriver, with fallback tocsiDriverImage.pullSecrets(optional: truefor legacydockercfg)1.4.0Also fixes the untaint e2e suite: enable
untaintController.*via Helm chart values instead ofDD_UNTAINT_*env vars alone. The chart always passes-untaintControllerEnabled=...as a CLI flag, which overrides env (env is applied beforeflag.Parse()), so the controller never started and the Agent never got the startup toleration — causinge2e_untaintto time out waiting for the Agent on the tainted node. Validated locally:TestUntaintAgentOnlyAWSKindPASS.Related Issue
Type of Change
Checklist
How Has This Been Tested?
go test ./internal/controller/datadogcsidriver/...go test ./internal/controller/datadogagent/ -run TestReconcileDatadogCSIDriver_TestUntaintAgentOnlyAWSKindPASS after the Helm values fixAdditional Notes
Classic Operator path is configure-only-on-
DatadogAgentand let it manage the CSI CR.