Conversation
…ort name override
khewonc
approved these changes
Feb 25, 2026
3 tasks
tbavelier
added a commit
that referenced
this pull request
Feb 27, 2026
Profile DDAIs only manage the Node Agent DaemonSet and should never reconcile cluster-level components (DCA, CCR, OTel Gateway). Previously this was harmless because the Cleanup function generated deployment names from the profile DDAI name (e.g. "profile-name-cluster-agent"), which never matched existing deployments. PR #2651 added override.Deployment() in Cleanup to resolve the correct deployment name via name overrides. Since profile DDAIs inherit the parent DDA's name overrides (via SSA merge) alongside disabled=true, Cleanup now resolves the real deployment name and deletes it, causing a delete/recreate loop with the main DDAI. Guard ReconcileComponents with isDDAILabeledWithProfile, consistent with the existing guards for dependency management and cleanup. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
3 tasks
gh-worker-dd-mergequeue-cf854d bot
pushed a commit
that referenced
this pull request
Feb 27, 2026
Skip component registry reconciliation for profile DDAIs Profile DDAIs only manage the Node Agent DaemonSet and should never reconcile cluster-level components (DCA, CCR, OTel Gateway). Previously this was harmless because the Cleanup function generated deployment names from the profile DDAI name (e.g. "profile-name-cluster-agent"), which never matched existing deployments. PR #2651 added override.Deployment() in Cleanup to resolve the correct deployment name via name overrides. Since profile DDAIs inherit the parent DDA's name overrides (via SSA merge) alongside disabled=true, Cleanup now resolves the real deployment name and deletes it, causing a delete/recreate loop with the main DDAI. Guard ReconcileComponents with isDDAILabeledWithProfile, consistent with the existing guards for dependency management and cleanup. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> Merge branch 'main' into tbavelier/do-not-reconcile-components-from-ddai-profiles Co-authored-by: levan-m <116471169+levan-m@users.noreply.github.com> Co-authored-by: levan.machablishvili <levan.machablishvili@datadoghq.com>
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
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.
What does this PR do?
Like DCA/CCR, adds a
cleanupOldOtelAgentGatewayDeploymentsto remove stale OTEL Gateway deployments, e.g. a user overrides the name, it should remove the default oneMotivation
Seamless experience for gateway the same as for DCA/CCR, name override should be properly supported
Additional Notes
It's based on #2635, so commit to review is 1d9fe7b
Minimum Agent Versions
Are there minimum versions of the Datadog Agent and/or Cluster Agent required?
Describe your test plan
spec.features.otelAgentGateway.enabled=truedda-name-otel-agent-gatewaydeployspec.override.otelAgentGateway.name=foofoothat is the otel agent gateway AND thedda-name-otel-agent-gatewaydeploy should not be present anymoreAlso follow these steps to QA #2635 (commits on which the branch is based):
spec.override.clusterAgent.disabled=truespec.override.clusterAgent.name=foofoo-deployment should be createdfoodeployment is cleaned upChecklist
bug,enhancement,refactoring,documentation,tooling, and/ordependenciesqa/skip-qalabel