Skip to content

Rename provider annotation key to agent.datadoghq.com/cluster-provider#3219

Merged
levan-m merged 1 commit into
mainfrom
levan-m/rename-provider-annotation-key
Jul 6, 2026
Merged

Rename provider annotation key to agent.datadoghq.com/cluster-provider#3219
levan-m merged 1 commit into
mainfrom
levan-m/rename-provider-annotation-key

Conversation

@levan-m

@levan-m levan-m commented Jul 2, 2026

Copy link
Copy Markdown
Collaborator

What does this PR do?

Aligns the DDA/DDAI provider annotation with the agent.datadoghq.com namespace used by other provider-related keys, and disambiguates it from the per-daemonset agent.datadoghq.com/provider override label.

Motivation

What inspired you to submit this pull request?

Additional Notes

Anything else we should know when reviewing?

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

Write there any instructions and details you may have to test your 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)

Aligns the DDA/DDAI provider annotation with the agent.datadoghq.com
namespace used by other provider-related keys, and disambiguates it
from the per-daemonset agent.datadoghq.com/provider override label.

Co-Authored-By: Claude Sonnet 5 <[email protected]>
@levan-m levan-m added this to the v1.29.0 milestone Jul 2, 2026
@levan-m
levan-m requested a review from a team July 2, 2026 22:18

@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: e993226edd

ℹ️ 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".

const (
// DDA/DDAI annotation key for provider used in reconciler to apply provider-specific configs
ProviderAnnotationKey = "datadoghq.com/provider"
ProviderAnnotationKey = "agent.datadoghq.com/cluster-provider"

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Preserve the old provider annotation as an alias

When upgrading an existing DatadogAgent or DatadogAgentProfile annotated with datadoghq.com/provider (for example gke-cos to strip /usr/src mounts, or openshift-rhcos), this rename makes the reconciler ignore that user override because resolveClusterProvider and the DDAI reconciler only read ProviderAnnotationKey. The old annotation is still copied through as inert metadata, so clusters can silently lose provider-specific mutations until users manually rename the annotation; please keep accepting the old key during migration.

Useful? React with 👍 / 👎.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Not sure it's really a concern, we've not documented it yet, and mostly relying on auto detection from the status which should not change

@datadog-datadog-us1-prod

This comment has been minimized.

@levan-m
levan-m merged commit 8735c9d into main Jul 6, 2026
50 checks passed
@levan-m
levan-m deleted the levan-m/rename-provider-annotation-key branch July 6, 2026 15:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants