Skip to content

[Backport v1.28] [CONTP-1715] Align Operator to Helm csi daemonset and include csidrivers RBAC for DCA#3132

Merged
gh-worker-dd-mergequeue-cf854d[bot] merged 1 commit into
v1.28from
backport-3093-to-v1.28
Jun 12, 2026
Merged

[Backport v1.28] [CONTP-1715] Align Operator to Helm csi daemonset and include csidrivers RBAC for DCA#3132
gh-worker-dd-mergequeue-cf854d[bot] merged 1 commit into
v1.28from
backport-3093-to-v1.28

Conversation

@dd-octo-sts

@dd-octo-sts dd-octo-sts Bot commented Jun 12, 2026

Copy link
Copy Markdown

Backport f36836a from #3093.

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 @github-actions
[CONTP-1715] Align Operator to Helm csi daemonset and include csidriv…
6c667f9 
…ers 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)
@dd-octo-sts dd-octo-sts Bot added bug Something isn't working qa/skip-qa labels Jun 12, 2026
@dd-octo-sts
dd-octo-sts Bot requested a review from a team as a code owner June 12, 2026 11:56
@dd-octo-sts dd-octo-sts Bot added backport label added by backport action bot label added by backport bot team/container-platform team/container-autoscaling labels Jun 12, 2026
@dd-octo-sts
dd-octo-sts Bot requested a review from a team as a code owner June 12, 2026 11:56
@dd-octo-sts dd-octo-sts Bot added this to the v1.28.0 milestone Jun 12, 2026
chatgpt-codex-connector[bot]
chatgpt-codex-connector Bot reviewed Jun 12, 2026
View reviewed changes

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 6c667f9331

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment thread internal/controller/datadogcsidriver/csidriver.go
Comment thread api/datadoghq/v1alpha1/datadogcsidriver_types.go
@codecov-commenter

codecov-commenter commented Jun 12, 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.35%. Comparing base (68d9802) to head (6c667f9).

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             @@
##            v1.28    #3132      +/-   ##
==========================================
+ Coverage   43.31%   43.35%   +0.04%     
==========================================
  Files         352      352              
  Lines       30049    30071      +22     
==========================================
+ Hits        13015    13037      +22     
  Misses      16161    16161              
  Partials      873      873
Flag Coverage Δ
unittests 43.35% <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 68d9802...6c667f9. Read the comment docs.

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

@datadog-prod-us1-6

datadog-prod-us1-6 Bot commented Jun 12, 2026 •
edited by datadog-official Bot
Loading

Copy link
Copy Markdown

Code Coverage

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

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

@gh-worker-dd-mergequeue-cf854d
gh-worker-dd-mergequeue-cf854d Bot merged commit 762837d into v1.28 Jun 12, 2026
93 checks passed
@gh-worker-dd-mergequeue-cf854d
gh-worker-dd-mergequeue-cf854d Bot deleted the backport-3093-to-v1.28 branch June 12, 2026 13:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@chatgpt-codex-connector chatgpt-codex-connector[bot] chatgpt-codex-connector[bot] left review comments
@tbavelier tbavelier tbavelier approved these changes

Assignees

No one assigned

Labels

backport label added by backport action bot label added by backport bot bug Something isn't working mergequeue-status: done 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.

2 participants

@codecov-commenter @tbavelier