Skip to content

[CONTP-1715] Align Operator to Helm csi daemonset and include csidrivers RBAC for DCA#3093

Merged
tbavelier merged 3 commits into
mainfrom
tbavelier/CONTP-1715-align-operator-helm-csi-daemonset
Jun 12, 2026
Merged

[CONTP-1715] Align Operator to Helm csi daemonset and include csidrivers RBAC for DCA#3093
tbavelier merged 3 commits into
mainfrom
tbavelier/CONTP-1715-align-operator-helm-csi-daemonset

Conversation

@tbavelier

@tbavelier tbavelier commented Jun 5, 2026 •
edited
Loading

Copy link
Copy Markdown
Member

What does this PR do?

  • Includes a new spec.apm.enabled field in the DatadogCSIDriver CRD that defaults to true and governs the daemonset env var DD_APM_ENABLED as well as the annotation on the CSIDriver: feat(datadog-csi-driver): annotate CSIDriver with apm-enabled helm-charts#2685
  • Uses the same storage paths as Helm: 
    // Host paths
kubeletPluginsDir = "/var/lib/kubelet/plugins/datadog.csi/driver"
kubeletStorageDir = "/var/lib/kubelet/plugins/datadog.csi/storage"
csiSocketPath     = "/var/lib/kubelet/plugins/datadog.csi/driver/csi.sock"
  • Uses deprecated k8s.gcr.io registry which re-directs under the hood to registry.k8s.io: this is needed as this is the entry in the GKE Autopilot allowlist
  • Add get/list/watch to DCA clusterrole when admissioncontroller feature is enabled

Motivation

What inspired you to submit this pull request?

Additional Notes

Easier to review commit by commit:

  • 0c0e9cd: Helm alignment for storage paths + registry + add APM annotation
  • 27731ec: introduces spec.apm.enabled
  • a321214: add get/list/watch to DCA clusterrole when admissioncontroller feature is enabled

Minimum Agent Versions

Are there minimum versions of the Datadog Agent and/or Cluster Agent required?

  • Agent: vX.Y.Z
  • Cluster Agent: vX.Y.Z

Describe your test plan

Manually QA'ed and will be tested with a follow-up PR

Checklist

  • PR has at least one valid label: bug, enhancement, refactoring, documentation, tooling, and/or dependencies
  • PR has a milestone or the qa/skip-qa label
  • All commits are signed (see: signing commits)

@tbavelier tbavelier added this to the v1.28.0 milestone Jun 5, 2026
@tbavelier
tbavelier requested a review from a team June 5, 2026 11:27
@tbavelier
tbavelier requested a review from a team as a code owner June 5, 2026 11:27
@tbavelier tbavelier added bug Something isn't working qa/skip-qa labels Jun 5, 2026
@codecov-commenter

codecov-commenter commented Jun 5, 2026 •
edited
Loading

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 97.36842% with 1 line in your changes missing coverage. Please review.
✅ Project coverage is 43.66%. Comparing base (6e4ddc3) to head (a321214).

Files with missing lines Patch % Lines
internal/controller/datadogcsidriver/daemonset.go 94.44% 1 Missing ⚠️
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #3093      +/-   ##
==========================================
+ Coverage   43.62%   43.66%   +0.04%     
==========================================
  Files         350      350              
  Lines       30089    30111      +22     
==========================================
+ Hits        13127    13149      +22     
  Misses      16090    16090              
  Partials      872      872
Flag Coverage Δ
unittests 43.66% <97.36%> (+0.04%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
...r/datadogagent/feature/admissioncontroller/rbac.go 92.07% <100.00%> (+1.27%) ⬆️
internal/controller/datadogagent_controller.go 62.12% <ø> (ø)
internal/controller/datadogcsidriver/controller.go 63.26% <100.00%> (+0.50%) ⬆️
internal/controller/datadogcsidriver/csidriver.go 100.00% <100.00%> (ø)
internal/controller/datadogcsidriver/daemonset.go 70.87% <94.44%> (+0.44%) ⬆️

Continue to review full report in Codecov by Harness.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6e4ddc3...a321214. Read the comment docs.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@datadog-datadog-prod-us1-2

datadog-datadog-prod-us1-2 Bot commented Jun 5, 2026 •
edited by datadog-prod-us1-3 Bot
Loading

Copy link
Copy Markdown

Code Coverage

🎯 Code Coverage (details)
• Patch Coverage: 96.97%
• Overall Coverage: 43.99% (+0.04%)

This comment will be updated automatically if new data arrives.
🔗 Commit SHA: a321214 | Docs | Datadog PR Page | Give us feedback!

@tbavelier tbavelier mentioned this pull request Jun 5, 2026
Merged
3 tasks
@tbavelier tbavelier changed the title [CONTP-1715] Align Operator to Helm csi daemonset [CONTP-1715] Align Operator to Helm csi daemonset and include csidrivers RBAC for DCA Jun 5, 2026
@tbavelier
tbavelier merged commit f36836a into main Jun 12, 2026
38 checks passed
@tbavelier
tbavelier deleted the tbavelier/CONTP-1715-align-operator-helm-csi-daemonset branch June 12, 2026 11:56
@dd-octo-sts dd-octo-sts Bot mentioned this pull request Jun 12, 2026
Merged
3 tasks
gh-worker-dd-mergequeue-cf854d Bot pushed a commit that referenced this pull request Jun 12, 2026
@dd-octo-sts @tbavelier
[CONTP-1715] Align Operator to Helm csi daemonset and include csidriv…
762837d 
…ers RBAC for DCA (#3093) (#3132)

[CONTP-1715] Align Operator to Helm csi daemonset and include csidrivers RBAC for DCA (#3093)

* Align with Helm Daemonset: volumes, deprecated registry, APM annotation

* Add spec.apm.enabled field to condition the CSIDriver annotation and daemonset env var

* Add list/watch/get for csidrivers to DCA clusterrole for admission controller

(cherry picked from commit f36836a)

Co-authored-by: tbavelier <[email protected]>
Co-authored-by: timothee.bavelier <[email protected]>
@dd-octo-sts dd-octo-sts Bot mentioned this pull request Jun 12, 2026
Merged
3 tasks
@iamluc iamluc mentioned this pull request Jun 25, 2026
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@khewonc khewonc khewonc approved these changes

Assignees

No one assigned

Labels

backport/v1.28 bug Something isn't working qa/skip-qa team/container-autoscaling team/container-platform

Projects

None yet

Milestone

v1.28.0

Development

Successfully merging this pull request may close these issues.

3 participants

@tbavelier @codecov-commenter @khewonc