Skip to content

Use registry.datadoghq.com for Agent image defaults #3098

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

Draft
AliDatadog wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Use registry.datadoghq.com for Agent image defaults #3098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion api/datadoghq/v2alpha1/datadogagent_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1801,13 +1801,14 @@ type GlobalConfig struct {
Endpoint *Endpoint `json:"endpoint,omitempty"`

// Registry is the image registry to use for all Agent images.
// Use 'registry.datadoghq.com' for Datadog Container Registry.
// Use 'public.ecr.aws/datadog' for AWS ECR.
// Use 'datadoghq.azurecr.io' for Azure Container Registry.
// Use 'gcr.io/datadoghq' for Google Container Registry.
// Use 'eu.gcr.io/datadoghq' for Google Container Registry in the EU region.
// Use 'asia.gcr.io/datadoghq' for Google Container Registry in the Asia region.
// Use 'docker.io/datadog' for DockerHub.
// Default: 'gcr.io/datadoghq'
// Default: 'registry.datadoghq.com'
// +optional
Registry *string `json:"registry,omitempty"`

Expand Down
3 changes: 2 additions & 1 deletion bundle/manifests/datadoghq.com_datadogagentinternals.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3808,13 +3808,14 @@ spec:
registry:
description: |-
Registry is the image registry to use for all Agent images.
Use 'registry.datadoghq.com' for Datadog Container Registry.
Use 'public.ecr.aws/datadog' for AWS ECR.
Use 'datadoghq.azurecr.io' for Azure Container Registry.
Use 'gcr.io/datadoghq' for Google Container Registry.
Use 'eu.gcr.io/datadoghq' for Google Container Registry in the EU region.
Use 'asia.gcr.io/datadoghq' for Google Container Registry in the Asia region.
Use 'docker.io/datadog' for DockerHub.
Default: 'gcr.io/datadoghq'
Default: 'registry.datadoghq.com'
type: string
secretBackend:
description: |-
Expand Down
3 changes: 2 additions & 1 deletion bundle/manifests/datadoghq.com_datadogagentprofiles.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3840,13 +3840,14 @@ spec:
registry:
description: |-
Registry is the image registry to use for all Agent images.
Use 'registry.datadoghq.com' for Datadog Container Registry.
Use 'public.ecr.aws/datadog' for AWS ECR.
Use 'datadoghq.azurecr.io' for Azure Container Registry.
Use 'gcr.io/datadoghq' for Google Container Registry.
Use 'eu.gcr.io/datadoghq' for Google Container Registry in the EU region.
Use 'asia.gcr.io/datadoghq' for Google Container Registry in the Asia region.
Use 'docker.io/datadog' for DockerHub.
Default: 'gcr.io/datadoghq'
Default: 'registry.datadoghq.com'
type: string
secretBackend:
description: |-
Expand Down
3 changes: 2 additions & 1 deletion bundle/manifests/datadoghq.com_datadogagents.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3811,13 +3811,14 @@ spec:
registry:
description: |-
Registry is the image registry to use for all Agent images.
Use 'registry.datadoghq.com' for Datadog Container Registry.
Use 'public.ecr.aws/datadog' for AWS ECR.
Use 'datadoghq.azurecr.io' for Azure Container Registry.
Use 'gcr.io/datadoghq' for Google Container Registry.
Use 'eu.gcr.io/datadoghq' for Google Container Registry in the EU region.
Use 'asia.gcr.io/datadoghq' for Google Container Registry in the Asia region.
Use 'docker.io/datadog' for DockerHub.
Default: 'gcr.io/datadoghq'
Default: 'registry.datadoghq.com'
type: string
secretBackend:
description: |-
Expand Down
3 changes: 2 additions & 1 deletion config/crd/bases/v1/datadoghq.com_datadogagentinternals.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3599,13 +3599,14 @@ spec:
registry:
description: |-
Registry is the image registry to use for all Agent images.
Use 'registry.datadoghq.com' for Datadog Container Registry.
Use 'public.ecr.aws/datadog' for AWS ECR.
Use 'datadoghq.azurecr.io' for Azure Container Registry.
Use 'gcr.io/datadoghq' for Google Container Registry.
Use 'eu.gcr.io/datadoghq' for Google Container Registry in the EU region.
Use 'asia.gcr.io/datadoghq' for Google Container Registry in the Asia region.
Use 'docker.io/datadog' for DockerHub.
Default: 'gcr.io/datadoghq'
Default: 'registry.datadoghq.com'
type: string
secretBackend:
description: |-
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/v1/datadoghq.com_datadogagentinternals_v1alpha1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3750,7 +3750,7 @@
"type": "object"
},
"registry": {
"description": "Registry is the image registry to use for all Agent images.\nUse 'public.ecr.aws/datadog' for AWS ECR.\nUse 'datadoghq.azurecr.io' for Azure Container Registry.\nUse 'gcr.io/datadoghq' for Google Container Registry.\nUse 'eu.gcr.io/datadoghq' for Google Container Registry in the EU region.\nUse 'asia.gcr.io/datadoghq' for Google Container Registry in the Asia region.\nUse 'docker.io/datadog' for DockerHub.\nDefault: 'gcr.io/datadoghq'",
"description": "Registry is the image registry to use for all Agent images.\nUse 'registry.datadoghq.com' for Datadog Container Registry.\nUse 'public.ecr.aws/datadog' for AWS ECR.\nUse 'datadoghq.azurecr.io' for Azure Container Registry.\nUse 'gcr.io/datadoghq' for Google Container Registry.\nUse 'eu.gcr.io/datadoghq' for Google Container Registry in the EU region.\nUse 'asia.gcr.io/datadoghq' for Google Container Registry in the Asia region.\nUse 'docker.io/datadog' for DockerHub.\nDefault: 'registry.datadoghq.com'",
"type": "string"
},
"secretBackend": {
Expand Down
3 changes: 2 additions & 1 deletion config/crd/bases/v1/datadoghq.com_datadogagentprofiles.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3599,13 +3599,14 @@ spec:
registry:
description: |-
Registry is the image registry to use for all Agent images.
Use 'registry.datadoghq.com' for Datadog Container Registry.
Use 'public.ecr.aws/datadog' for AWS ECR.
Use 'datadoghq.azurecr.io' for Azure Container Registry.
Use 'gcr.io/datadoghq' for Google Container Registry.
Use 'eu.gcr.io/datadoghq' for Google Container Registry in the EU region.
Use 'asia.gcr.io/datadoghq' for Google Container Registry in the Asia region.
Use 'docker.io/datadog' for DockerHub.
Default: 'gcr.io/datadoghq'
Default: 'registry.datadoghq.com'
type: string
secretBackend:
description: |-
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/v1/datadoghq.com_datadogagentprofiles_v1alpha1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3754,7 +3754,7 @@
"type": "object"
},
"registry": {
"description": "Registry is the image registry to use for all Agent images.\nUse 'public.ecr.aws/datadog' for AWS ECR.\nUse 'datadoghq.azurecr.io' for Azure Container Registry.\nUse 'gcr.io/datadoghq' for Google Container Registry.\nUse 'eu.gcr.io/datadoghq' for Google Container Registry in the EU region.\nUse 'asia.gcr.io/datadoghq' for Google Container Registry in the Asia region.\nUse 'docker.io/datadog' for DockerHub.\nDefault: 'gcr.io/datadoghq'",
"description": "Registry is the image registry to use for all Agent images.\nUse 'registry.datadoghq.com' for Datadog Container Registry.\nUse 'public.ecr.aws/datadog' for AWS ECR.\nUse 'datadoghq.azurecr.io' for Azure Container Registry.\nUse 'gcr.io/datadoghq' for Google Container Registry.\nUse 'eu.gcr.io/datadoghq' for Google Container Registry in the EU region.\nUse 'asia.gcr.io/datadoghq' for Google Container Registry in the Asia region.\nUse 'docker.io/datadog' for DockerHub.\nDefault: 'registry.datadoghq.com'",
"type": "string"
},
"secretBackend": {
Expand Down
3 changes: 2 additions & 1 deletion config/crd/bases/v1/datadoghq.com_datadogagents.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3603,13 +3603,14 @@ spec:
registry:
description: |-
Registry is the image registry to use for all Agent images.
Use 'registry.datadoghq.com' for Datadog Container Registry.
Use 'public.ecr.aws/datadog' for AWS ECR.
Use 'datadoghq.azurecr.io' for Azure Container Registry.
Use 'gcr.io/datadoghq' for Google Container Registry.
Use 'eu.gcr.io/datadoghq' for Google Container Registry in the EU region.
Use 'asia.gcr.io/datadoghq' for Google Container Registry in the Asia region.
Use 'docker.io/datadog' for DockerHub.
Default: 'gcr.io/datadoghq'
Default: 'registry.datadoghq.com'
type: string
secretBackend:
description: |-
Expand Down
4 changes: 2 additions & 2 deletions config/crd/bases/v1/datadoghq.com_datadogagents_v1alpha1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11136,7 +11136,7 @@
"type": "object"
},
"registry": {
"description": "Registry to use for all Agent images (default gcr.io/datadoghq). Use public.ecr.aws/datadog for AWS Use docker.io/datadog for DockerHub",
"description": "Registry to use for all Agent images (default registry.datadoghq.com). Use public.ecr.aws/datadog for AWS. Use gcr.io/datadoghq for Google Container Registry. Use docker.io/datadog for DockerHub.",
"type": "string"
},
"site": {
Expand Down Expand Up @@ -11374,4 +11374,4 @@
}
},
"type": "object"
}
}
2 changes: 1 addition & 1 deletion config/crd/bases/v1/datadoghq.com_datadogagents_v2alpha1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3750,7 +3750,7 @@
"type": "object"
},
"registry": {
"description": "Registry is the image registry to use for all Agent images.\nUse 'public.ecr.aws/datadog' for AWS ECR.\nUse 'datadoghq.azurecr.io' for Azure Container Registry.\nUse 'gcr.io/datadoghq' for Google Container Registry.\nUse 'eu.gcr.io/datadoghq' for Google Container Registry in the EU region.\nUse 'asia.gcr.io/datadoghq' for Google Container Registry in the Asia region.\nUse 'docker.io/datadog' for DockerHub.\nDefault: 'gcr.io/datadoghq'",
"description": "Registry is the image registry to use for all Agent images.\nUse 'registry.datadoghq.com' for Datadog Container Registry.\nUse 'public.ecr.aws/datadog' for AWS ECR.\nUse 'datadoghq.azurecr.io' for Azure Container Registry.\nUse 'gcr.io/datadoghq' for Google Container Registry.\nUse 'eu.gcr.io/datadoghq' for Google Container Registry in the EU region.\nUse 'asia.gcr.io/datadoghq' for Google Container Registry in the Asia region.\nUse 'docker.io/datadog' for DockerHub.\nDefault: 'registry.datadoghq.com'",
"type": "string"
},
"secretBackend": {
Expand Down
24 changes: 12 additions & 12 deletions internal/controller/datadogagent/controller_v2_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1091,9 +1091,9 @@ func Test_otelImageTags(t *testing.T) {
verifyDaemonsetContainers(t, c, resourcesNamespace, dsName, expectedContainers)
agentContainer := getDsContainers(c, resourcesNamespace, dsName)

assert.Equal(t, fmt.Sprintf("gcr.io/datadoghq/agent:%s", images.AgentLatestVersion), agentContainer[apicommon.CoreAgentContainerName].Image)
assert.Equal(t, fmt.Sprintf("gcr.io/datadoghq/agent:%s", images.AgentLatestVersion), agentContainer[apicommon.TraceAgentContainerName].Image)
assert.Equal(t, fmt.Sprintf("gcr.io/datadoghq/ddot-collector:%s", images.AgentLatestVersion), agentContainer[apicommon.OtelAgent].Image)
assert.Equal(t, fmt.Sprintf("registry.datadoghq.com/agent:%s", images.AgentLatestVersion), agentContainer[apicommon.CoreAgentContainerName].Image)
assert.Equal(t, fmt.Sprintf("registry.datadoghq.com/agent:%s", images.AgentLatestVersion), agentContainer[apicommon.TraceAgentContainerName].Image)
assert.Equal(t, fmt.Sprintf("registry.datadoghq.com/ddot-collector:%s", images.AgentLatestVersion), agentContainer[apicommon.OtelAgent].Image)

},
},
Expand All @@ -1117,9 +1117,9 @@ func Test_otelImageTags(t *testing.T) {
verifyDaemonsetContainers(t, c, resourcesNamespace, dsName, expectedContainers)
agentContainer := getDsContainers(c, resourcesNamespace, dsName)

assert.Equal(t, "gcr.io/datadoghq/agent:7.71.0", agentContainer[apicommon.CoreAgentContainerName].Image)
assert.Equal(t, "gcr.io/datadoghq/agent:7.71.0", agentContainer[apicommon.TraceAgentContainerName].Image)
assert.Equal(t, "gcr.io/datadoghq/ddot-collector:7.71.0", agentContainer[apicommon.OtelAgent].Image)
assert.Equal(t, "registry.datadoghq.com/agent:7.71.0", agentContainer[apicommon.CoreAgentContainerName].Image)
assert.Equal(t, "registry.datadoghq.com/agent:7.71.0", agentContainer[apicommon.TraceAgentContainerName].Image)
assert.Equal(t, "registry.datadoghq.com/ddot-collector:7.71.0", agentContainer[apicommon.OtelAgent].Image)

},
},
Expand Down Expand Up @@ -1179,9 +1179,9 @@ func Test_otelImageTags(t *testing.T) {
verifyDaemonsetContainers(t, c, resourcesNamespace, dsName, expectedContainers)
agentContainer := getDsContainers(c, resourcesNamespace, dsName)

assert.Equal(t, "gcr.io/datadoghq/testagent:7.65.0-full", agentContainer[apicommon.CoreAgentContainerName].Image)
assert.Equal(t, "gcr.io/datadoghq/testagent:7.65.0-full", agentContainer[apicommon.TraceAgentContainerName].Image)
assert.Equal(t, "gcr.io/datadoghq/testagent:7.65.0-full", agentContainer[apicommon.OtelAgent].Image)
assert.Equal(t, "registry.datadoghq.com/testagent:7.65.0-full", agentContainer[apicommon.CoreAgentContainerName].Image)
assert.Equal(t, "registry.datadoghq.com/testagent:7.65.0-full", agentContainer[apicommon.TraceAgentContainerName].Image)
assert.Equal(t, "registry.datadoghq.com/testagent:7.65.0-full", agentContainer[apicommon.OtelAgent].Image)

},
},
Expand All @@ -1204,9 +1204,9 @@ func Test_otelImageTags(t *testing.T) {
verifyDaemonsetContainers(t, c, resourcesNamespace, dsName, expectedContainers)
agentContainer := getDsContainers(c, resourcesNamespace, dsName)

assert.Equal(t, "gcr.io/datadoghq/testagent:7.65.0-full", agentContainer[apicommon.CoreAgentContainerName].Image)
assert.Equal(t, "gcr.io/datadoghq/testagent:7.65.0-full", agentContainer[apicommon.TraceAgentContainerName].Image)
assert.Equal(t, "gcr.io/datadoghq/testagent:7.65.0-full", agentContainer[apicommon.OtelAgent].Image)
assert.Equal(t, "registry.datadoghq.com/testagent:7.65.0-full", agentContainer[apicommon.CoreAgentContainerName].Image)
assert.Equal(t, "registry.datadoghq.com/testagent:7.65.0-full", agentContainer[apicommon.TraceAgentContainerName].Image)
assert.Equal(t, "registry.datadoghq.com/testagent:7.65.0-full", agentContainer[apicommon.OtelAgent].Image)

},
},
Expand Down
2 changes: 1 addition & 1 deletion pkg/images/images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const (
// PublicECSContainerRegistry corresponds to the datadoghq PublicECSContainerRegistry registry
PublicECSContainerRegistry = "public.ecr.aws/datadog"
// DefaultImageRegistry corresponds to the datadoghq containers registry
DefaultImageRegistry = "gcr.io/datadoghq"
DefaultImageRegistry = DatadogContainerRegistry
// Default Image Registries
DefaultAzureImageRegistry string = "datadoghq.azurecr.io"
DefaultEuropeImageRegistry string = "eu.gcr.io/datadoghq"
Expand Down
8 changes: 4 additions & 4 deletions pkg/images/images_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func TestGetLatestAgentImage(t *testing.T) {
}{
{
name: "default registry",
want: fmt.Sprintf("gcr.io/datadoghq/agent:%s", AgentLatestVersion),
want: fmt.Sprintf("registry.datadoghq.com/agent:%s", AgentLatestVersion),
},
}
for _, tt := range tests {
Expand All @@ -41,7 +41,7 @@ func TestGetLatestClusterAgentImage(t *testing.T) {
}{
{
name: "default registry",
want: fmt.Sprintf("gcr.io/datadoghq/cluster-agent:%s", ClusterAgentLatestVersion),
want: fmt.Sprintf("registry.datadoghq.com/cluster-agent:%s", ClusterAgentLatestVersion),
},
}
for _, tt := range tests {
Expand Down Expand Up @@ -207,7 +207,7 @@ func Test_AssembleImage(t *testing.T) {
Name: "agent",
Tag: "latest",
},
want: "gcr.io/datadoghq/agent:latest",
want: "registry.datadoghq.com/agent:latest",
},
{
name: "cluster-agent",
Expand All @@ -225,7 +225,7 @@ func Test_AssembleImage(t *testing.T) {
Tag: "latest-jmx",
JMXEnabled: true,
},
want: "gcr.io/datadoghq/agent:latest-jmx",
want: "registry.datadoghq.com/agent:latest-jmx",
},
}
for _, tt := range tests {
Expand Down
Loading