Skip to content

Clean registry migration and force GCR on GKE Autopilot if unset#3240

Merged
tbavelier merged 3 commits into
mainfrom
tbavelier/clean-registry-migration-and-force-gcr-autopilot
Jul 9, 2026
Merged

Clean registry migration and force GCR on GKE Autopilot if unset#3240
tbavelier merged 3 commits into
mainfrom
tbavelier/clean-registry-migration-and-force-gcr-autopilot

Conversation

@tbavelier

@tbavelier tbavelier commented Jul 9, 2026

Copy link
Copy Markdown
Member

What does this PR do?

  • c50d2ec Defaults Agent images to registry.datadoghq.com and removes the DD_REGISTRY_OVERRIDE_* migration path.
  • 4485a2e Forces GCR for GKE Autopilot unless an explicit GCR, EU GCR, or Asia GCR registry is configured.
  • 3672d18 remove useless test matrix since the switch is simpler now

Motivation

  • Clean up migration env vars: registry has been live for a while now without issues
  • Ensure we can deploy on Autopilot overriding the default/user mistake

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

  • Verify images are pulled from registry.datadoghq.com by default when deploying on kind
  • On a GKE Autopilot cluster, set no registry and ensure images are pulled from gcr.io/datadoghq.

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.29.0 milestone Jul 9, 2026
@tbavelier tbavelier added the enhancement New feature or request label Jul 9, 2026
@datadog-datadog-prod-us1-2

datadog-datadog-prod-us1-2 Bot commented Jul 9, 2026

Copy link
Copy Markdown

Code Coverage

Fix all issues with BitsAI

🛑 Gate Violations

🎯 1 Code Coverage issue detected

A Patch coverage percentage gate may be blocking this PR.

Patch coverage: 70.59% (threshold: 80.00%)

ℹ️ Info

🎯 Code Coverage (details)
Patch Coverage: 70.59%
Overall Coverage: 46.37% (+0.01%)

Useful? React with 👍 / 👎

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

@tbavelier
tbavelier marked this pull request as ready for review July 9, 2026 10:03
@tbavelier
tbavelier requested a review from a team July 9, 2026 10:03
@tbavelier
tbavelier requested a review from a team as a code owner July 9, 2026 10:03
Comment thread pkg/images/images.go

// IsGCRRegistry reports whether registry points to a Datadog GCR registry,
// including the known regional GCR registries.
func IsGCRRegistry(registry string) bool {

@gabedos gabedos Jul 9, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

potential nit: https://docs.cloud.google.com/artifact-registry/docs/transition/gcr-repositories?utm_source=chatgpt.com#gcr-domain-support

us.gcr.io also exists and could be added here? Also, maybe we can make this more resilient by using regex if we expect the gcr.io in the name? This will make it so that no specific Operator version is pinned down to the registries that existed when the Operator was released.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I initially went indeed with something that only looks for gcr.io string inside repositories, but felt like it was cleaner like this. We (Datadog) only use gcr.io/datadoghq, eu.gcr.io/datadoghq and asia one. If we add a new GCR registry, it will need to be present in operator code anyway, so this function can then be updated imho. What do you think ?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Yeah I think this is fine! I'm split 50/50 either way on it

@gabedos gabedos left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Defaulting to registry.datadoghq.com alongside specific gke autopilot overrides lgtm

@tbavelier
tbavelier merged commit eda77d8 into main Jul 9, 2026
37 of 38 checks passed
@tbavelier
tbavelier deleted the tbavelier/clean-registry-migration-and-force-gcr-autopilot branch July 9, 2026 15:45
@dd-octo-sts

dd-octo-sts Bot commented Jul 13, 2026

Copy link
Copy Markdown

The backport to v1.29 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-v1.29 v1.29
# Navigate to the new working tree
cd .worktrees/backport-v1.29
# Create a new branch
git switch --create backport-3240-to-v1.29
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 eda77d82eeb31ca6cbecfe014347d873b1c43446
# Push it to GitHub
git push --set-upstream origin backport-3240-to-v1.29
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v1.29

Then, create a pull request where the base branch is v1.29 and the compare/head branch is backport-3240-to-v1.29.

tbavelier added a commit that referenced this pull request Jul 13, 2026
…) (#3254)

* Default Agent images to Datadog registry

* Force GCR registry for Autopilot

* Trim registry defaulting test matrix
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