Skip to content

[CONTP-1612] support enabling untaint controller in datadog chart - #2782

Open
adel121 wants to merge 4 commits into
mainfrom
adelhajhassan/support-enabling-untaint-controller-in-datadog-chart
Open

[CONTP-1612] support enabling untaint controller in datadog chart#2782
adel121 wants to merge 4 commits into
mainfrom
adelhajhassan/support-enabling-untaint-controller-in-datadog-chart

Conversation

@adel121

@adel121 adel121 commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

DO NOT MERGE YET

What this PR does / why we need it:

Which issue this PR fixes

For Helm-managed clusters (agent installed via charts/datadog, no operator managing the agent), users need to opt the agent into tolerating the startup taint so it can schedule on tainted nodes. The untaint controller's pod label selector already works for Helm-managed agents — charts/datadog uses agent.datadoghq.com/component: agent on the node agent DaemonSet — so no label change is needed, only the toleration.

In this PR, we:

  • Add operator.untaintController.enabled value (default false) to values.yaml
  • Inject the toleration into the agent DaemonSet template when enabled, and activate the untaint controller feature in the operator.
  • Add Helm unit test verifying the toleration appears in the rendered DaemonSet

Testing

Added unit test

Manual testing:

Deploy the agent using helm chart with the added option enabled. Ensure the toleration is added properly:

Deployed agent with appended at the end of values.yml:

operator:
  untaintController:
    enabled: true

Checked that the toleration was properly added:

      tolerations:
      - effect: NoSchedule
        key: agent.datadoghq.com/not-ready
        operator: Equal
        value: presence

Special notes for your reviewer:

The CSI driver may also need a similar change, but since CSI is usually used as a subchart (dependency of the agent chart), and the user can already set tolerations manually on the CSI by editing datadog_csi_driver section in datadog values.yaml, I am keeping it for a future PR to asses if it is worth adding a separate config option for CSI or not.

Checklist

[Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.]

  • All commits are signed and show as "Verified" on GitHub (see: signing commits)
  • Chart Version semver bump label has been added (use <chartName>/minor-version, <chartName>/patch-version, or <chartName>/no-version-bump)
  • For datadog or datadog-operator chart or value changes, update the test baselines (run: make update-test-baselines)
  • For datadog chart changes, received ✅ from a member of your team

GitHub CI takes care of the below, but are still required:

  • Documentation has been updated with helm-docs (run: .github/helm-docs.sh)
  • CHANGELOG.md has been updated
  • Variables are documented in the README.md

DO NOT MERGE YET

@github-actions github-actions Bot added chart/datadog This issue or pull request is related to the datadog chart chart/datadog-operator This issue or pull request is related to the datadog-operator chart labels Jul 9, 2026
@adel121 adel121 changed the title support enabling untaint controller in datadog chart [CONTP-1612] support enabling untaint controller in datadog chart Jul 9, 2026
@adel121
adel121 changed the base branch from main to CONTP-1612/untaint-controller-config July 9, 2026 12:34
@adel121 adel121 added datadog/minor-version Minor version bump for datadog chart and removed chart/datadog-operator This issue or pull request is related to the datadog-operator chart labels Jul 9, 2026
@adel121
adel121 marked this pull request as ready for review July 9, 2026 12:53
@adel121
adel121 requested review from a team as code owners July 9, 2026 12:53
@adel121
adel121 requested review from gpalmz and removed request for a team July 9, 2026 12:53
@datadog-prod-us1-4

This comment has been minimized.

Base automatically changed from CONTP-1612/untaint-controller-config to main July 10, 2026 13:31
@adel121
adel121 requested a review from a team as a code owner July 10, 2026 13:31
@gpalmz
gpalmz requested review from fanny-jiang and removed request for gpalmz July 21, 2026 13:34
@github-actions github-actions Bot added the chart/datadog-operator This issue or pull request is related to the datadog-operator chart label Jul 27, 2026
@gh-worker-ownership-write-b05516
gh-worker-ownership-write-b05516 Bot removed the request for review from a team July 27, 2026 11:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

chart/datadog This issue or pull request is related to the datadog chart chart/datadog-operator This issue or pull request is related to the datadog-operator chart datadog/minor-version Minor version bump for datadog chart

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant