Skip to content

Use registry.datadoghq.com for external image defaults #51160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AliDatadog wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Use registry.datadoghq.com for external image defaults #51160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f96717c
Use registry.datadoghq.com for external images
AliDatadog May 21, 2026
66a62a5
Keep SSI allow-list test on gcr defaults
AliDatadog May 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfiles/agent-ddot/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG BASE_IMAGE_DD_VERSION=latest
FROM gcr.io/datadoghq/agent:$BASE_IMAGE_DD_VERSION AS baseimage
FROM registry.datadoghq.com/agent:$BASE_IMAGE_DD_VERSION AS baseimage

FROM baseimage

Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/agent-ddot/Dockerfile.agent-otel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# check=skip=SecretsUsedInArgOrEnv
ARG AGENT_DOCKER_REPO=datadog/agent
ARG AGENT_DOCKER_REPO=registry.datadoghq.com/agent
ARG AGENT_VERSION=7.72.2
ARG UBUNTU_VERSION=24.04
ARG AGENT_DOCKER_TAG=${AGENT_VERSION}-full
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/manifests/agent-kubelet-only.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
spec:
serviceAccountName: datadog-agent
containers:
- image: datadog/agent:7
- image: registry.datadoghq.com/agent:7
imagePullPolicy: Always
name: datadog-agent
env:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/manifests/agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spec:
spec:
serviceAccountName: datadog-agent
containers:
- image: datadog/agent:7
- image: registry.datadoghq.com/agent:7
imagePullPolicy: Always
name: datadog-agent
ports:
Expand Down
6 changes: 3 additions & 3 deletions Dockerfiles/manifests/all-containers/cluster-agent-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
automountServiceAccountToken: true
initContainers:
- name: init-volume
image: "gcr.io/datadoghq/cluster-agent:7.76.1"
image: "registry.datadoghq.com/cluster-agent:7.76.1"
imagePullPolicy: IfNotPresent
command:
- cp
Expand All @@ -49,7 +49,7 @@ spec:
mountPath: /opt/datadog-agent
containers:
- name: cluster-agent
image: "gcr.io/datadoghq/cluster-agent:7.76.1"
image: "registry.datadoghq.com/cluster-agent:7.76.1"
imagePullPolicy: IfNotPresent
resources: {}
ports:
Expand Down Expand Up @@ -116,7 +116,7 @@ spec:
- name: DD_ADMISSION_CONTROLLER_PORT
value: "8000"
- name: DD_ADMISSION_CONTROLLER_CONTAINER_REGISTRY
value: "gcr.io/datadoghq"
value: "registry.datadoghq.com"
- name: DD_REMOTE_CONFIGURATION_ENABLED
value: "false"
- name: DD_CLUSTER_CHECKS_ENABLED
Expand Down
16 changes: 8 additions & 8 deletions Dockerfiles/manifests/all-containers/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
hostPID: true
containers:
- name: agent
image: "gcr.io/datadoghq/agent:7.76.1"
image: "registry.datadoghq.com/agent:7.76.1"
imagePullPolicy: IfNotPresent
command: ["agent", "run"]
securityContext:
Expand Down Expand Up @@ -248,7 +248,7 @@ spec:
successThreshold: 1
timeoutSeconds: 5
- name: trace-agent
image: "gcr.io/datadoghq/agent:7.76.1"
image: "registry.datadoghq.com/agent:7.76.1"
imagePullPolicy: IfNotPresent
command: ["trace-loader", "/etc/datadog-agent/datadog.yaml", "trace-agent", "-config=/etc/datadog-agent/datadog.yaml"]
securityContext:
Expand Down Expand Up @@ -356,7 +356,7 @@ spec:
port: 8126
timeoutSeconds: 5
- name: process-agent
image: "gcr.io/datadoghq/agent:7.76.1"
image: "registry.datadoghq.com/agent:7.76.1"
imagePullPolicy: IfNotPresent
command: ["process-agent", "--cfgpath=/etc/datadog-agent/datadog.yaml"]
securityContext:
Expand Down Expand Up @@ -459,7 +459,7 @@ spec:
subPath: system-probe.yaml
readOnly: true
- name: system-probe
image: "gcr.io/datadoghq/agent:7.76.1"
image: "registry.datadoghq.com/agent:7.76.1"
imagePullPolicy: IfNotPresent
securityContext:
capabilities:
Expand Down Expand Up @@ -570,7 +570,7 @@ spec:
mountPropagation: None
readOnly: true
- name: security-agent
image: "gcr.io/datadoghq/agent:7.76.1"
image: "registry.datadoghq.com/agent:7.76.1"
imagePullPolicy: IfNotPresent
securityContext:
capabilities:
Expand Down Expand Up @@ -684,7 +684,7 @@ spec:
readOnly: true
initContainers:
- name: init-volume
image: "gcr.io/datadoghq/agent:7.76.1"
image: "registry.datadoghq.com/agent:7.76.1"
imagePullPolicy: IfNotPresent
command: ["bash", "-c"]
args:
Expand All @@ -695,7 +695,7 @@ spec:
readOnly: false # Need RW for config path
resources: {}
- name: init-config
image: "gcr.io/datadoghq/agent:7.76.1"
image: "registry.datadoghq.com/agent:7.76.1"
imagePullPolicy: IfNotPresent
command:
- bash
Expand Down Expand Up @@ -749,7 +749,7 @@ spec:
value: "false"
resources: {}
- name: seccomp-setup
image: "gcr.io/datadoghq/agent:7.76.1"
image: "registry.datadoghq.com/agent:7.76.1"
imagePullPolicy: IfNotPresent
command:
- cp
Expand Down
2 changes: 1 addition & 1 deletion cmd/host-profiler/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: "host-profiler-with-agent"

services:
datadog-agent:
image: gcr.io/datadoghq/agent:7
image: registry.datadoghq.com/agent:7
privileged: true
environment:
DD_SITE: ${DD_SITE:-datadoghq.com}
Expand Down
4 changes: 2 additions & 2 deletions tasks/agent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ def hacky_dev_image_build(

# Try to guess what is the latest release of the agent
latest_release = semver.VersionInfo(0)
tags = requests.get("https://gcr.io/v2/datadoghq/agent/tags/list", timeout=10)
tags = requests.get("https://registry.datadoghq.com/v2/agent/tags/list", timeout=10)
for tag in tags.json()['tags']:
if not semver.VersionInfo.isvalid(tag):
continue
Expand All @@ -478,7 +478,7 @@ def hacky_dev_image_build(
continue
if ver > latest_release:
latest_release = ver
base_image = f"gcr.io/datadoghq/agent:{latest_release}"
base_image = f"registry.datadoghq.com/agent:{latest_release}"

# Extract the python library of the docker image
with tempfile.TemporaryDirectory() as extracted_python_dir:
Expand Down
4 changes: 2 additions & 2 deletions tasks/cluster_agent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ def hacky_dev_image_build(

# Try to guess what is the latest release of the cluster-agent
latest_release = semver.VersionInfo(0)
tags = requests.get("https://gcr.io/v2/datadoghq/cluster-agent/tags/list")
tags = requests.get("https://registry.datadoghq.com/v2/cluster-agent/tags/list")
for tag in tags.json()['tags']:
if not semver.VersionInfo.isvalid(tag):
continue
Expand All @@ -212,7 +212,7 @@ def hacky_dev_image_build(
continue
if ver > latest_release:
latest_release = ver
base_image = f"gcr.io/datadoghq/cluster-agent:{latest_release}"
base_image = f"registry.datadoghq.com/cluster-agent:{latest_release}"

with tempfile.NamedTemporaryFile(mode='w') as dockerfile:
dockerfile.write(
Expand Down
6 changes: 3 additions & 3 deletions test/e2e-framework/components/datadog/agent/docker_image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import (
)

const (
defaultAgentImageRepo = "gcr.io/datadoghq/agent"
defaultClusterAgentImageRepo = "gcr.io/datadoghq/cluster-agent"
defaultOTelAgentGatewayImageRepo = "gcr.io/datadoghq/ddot-collector"
defaultAgentImageRepo = "registry.datadoghq.com/agent"
defaultClusterAgentImageRepo = "registry.datadoghq.com/cluster-agent"
defaultOTelAgentGatewayImageRepo = "registry.datadoghq.com/ddot-collector"
defaultAgentImageTag = "latest"
defaultAgent6ImageTag = "6"
defaultDevAgentImageRepo = "datadog/agent-dev" // Used as default repository for images that are not stable and released yet, should not be used in the CI
Expand Down
2 changes: 1 addition & 1 deletion test/e2e-framework/components/datadog/csi-driver/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func NewDatadogCSIDriver(e config.Env, kubeProvider *kubernetes.Provider, csiDri
}
opts = append(opts, utils.PulumiDependsOn(ns))

csiRepo := "docker.io/datadog/csi-driver"
csiRepo := "registry.datadoghq.com/csi-driver"
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot May 22, 2026

Choose a reason for hiding this comment

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

P2 Badge Keep CSI driver dev SHA on its published repo

When the KindVM operator scenario deploys CSI, it passes the pinned csiDriverCommitSHA from test/e2e-framework/scenarios/aws/kindvm/run_args.go into NewDatadogCSIDriver, so local/custom runs without imagePullRegistry now try to pull registry.datadoghq.com/csi-driver:<commit-sha>. The fallback branch immediately below still maps CSI through /dockerhub/datadog/csi-driver, which is where this dev SHA is expected to be mirrored; if the Datadog registry only has release tags, these operator runs fail with ImagePullBackOff before the test can start. Either keep the default on docker.io/datadog/csi-driver for SHA-based deployments or update the pinned tag to one published in the Datadog registry.

Useful? React with 👍 / 👎.

registrarRepo := "registry.k8s.io/sig-storage/csi-node-driver-registrar"

var imgPullSecret *corev1.Secret
Expand Down
2 changes: 1 addition & 1 deletion test/e2e-framework/components/datadog/dogstatsd-standalone/docker_image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
)

const (
defaultDogstatsdImageRepo = "gcr.io/datadoghq/dogstatsd"
defaultDogstatsdImageRepo = "registry.datadoghq.com/dogstatsd"
defaultDogstatsdImageTag = "latest"
)

Expand Down
2 changes: 1 addition & 1 deletion test/e2e-framework/components/datadog/dogstatsd-standalone/k8s.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ func K8sAppDefinition(e config.Env, kubeProvider *kubernetes.Provider, namespace
Containers: corev1.ContainerArray{
&corev1.ContainerArgs{
Name: pulumi.String("dogstatsd-standalone"),
Image: pulumi.String(dockerDogstatsdFullImagePath(e, "gcr.io/datadoghq/dogstatsd")),
Image: pulumi.String(dockerDogstatsdFullImagePath(e, "registry.datadoghq.com/dogstatsd")),
Ports: corev1.ContainerPortArray{
&corev1.ContainerPortArgs{
ContainerPort: pulumi.Int(8125),
Expand Down
2 changes: 1 addition & 1 deletion test/e2e-framework/components/datadog/operator/docker_image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
)

const (
defaultOperatorImageRepo = "gcr.io/datadoghq/operator"
defaultOperatorImageRepo = "registry.datadoghq.com/operator"
defaultOperatorImageTag = "latest"
)

Expand Down
2 changes: 1 addition & 1 deletion test/e2e-framework/scenarios/gcp/fakeintake/params.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ type Option = func(*Params) error
// NewParams returns a new instance of Fakeintake Params
func NewParams(options ...Option) (*Params, error) {
params := &Params{
ImageURL: "gcr.io/datadoghq/fakeintake:latest",
ImageURL: "registry.datadoghq.com/fakeintake:latest",
DDDevForwarding: true,
Memory: 1024,
LoadBalancer: false,
Expand Down
2 changes: 1 addition & 1 deletion test/new-e2e/tests/ssi/testdata/base.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ clusterAgent:
# Temporary until the Datadog CSI driver is released
datadog-csi-driver:
image:
repository: "gcr.io/datadoghq/csi-driver"
repository: "registry.datadoghq.com/csi-driver"
tag: "1.2.0"

datadog:
Expand Down
2 changes: 1 addition & 1 deletion test/new-e2e/tests/ssi/testdata/injection_mode.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ clusterAgent:
# Temporary until the Datadog CSI driver is released
datadog-csi-driver:
image:
repository: "gcr.io/datadoghq/csi-driver"
repository: "registry.datadoghq.com/csi-driver"
tag: "1.2.0"

datadog:
Expand Down
2 changes: 1 addition & 1 deletion test/new-e2e/tests/ssi/testdata/registry_allow_list.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ clusterAgent:
# Temporary until the Datadog CSI driver is released
datadog-csi-driver:
image:
repository: "gcr.io/datadoghq/csi-driver"
repository: "registry.datadoghq.com/csi-driver"
tag: "1.2.0"

datadog:
Expand Down
Loading