diff --git a/api/datadoghq/v2alpha1/datadogagent_types.go b/api/datadoghq/v2alpha1/datadogagent_types.go index e5caad21ba..e0d921e8c4 100644 --- a/api/datadoghq/v2alpha1/datadogagent_types.go +++ b/api/datadoghq/v2alpha1/datadogagent_types.go @@ -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"` diff --git a/bundle/manifests/datadoghq.com_datadogagentinternals.yaml b/bundle/manifests/datadoghq.com_datadogagentinternals.yaml index 206935f300..f9b38cf9dd 100644 --- a/bundle/manifests/datadoghq.com_datadogagentinternals.yaml +++ b/bundle/manifests/datadoghq.com_datadogagentinternals.yaml @@ -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: |- diff --git a/bundle/manifests/datadoghq.com_datadogagentprofiles.yaml b/bundle/manifests/datadoghq.com_datadogagentprofiles.yaml index c56d161f07..40baadfe71 100644 --- a/bundle/manifests/datadoghq.com_datadogagentprofiles.yaml +++ b/bundle/manifests/datadoghq.com_datadogagentprofiles.yaml @@ -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: |- diff --git a/bundle/manifests/datadoghq.com_datadogagents.yaml b/bundle/manifests/datadoghq.com_datadogagents.yaml index a02aa7f0ad..36b20c78c8 100644 --- a/bundle/manifests/datadoghq.com_datadogagents.yaml +++ b/bundle/manifests/datadoghq.com_datadogagents.yaml @@ -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: |- diff --git a/config/crd/bases/v1/datadoghq.com_datadogagentinternals.yaml b/config/crd/bases/v1/datadoghq.com_datadogagentinternals.yaml index 29f45c60c1..c7c975c0d7 100644 --- a/config/crd/bases/v1/datadoghq.com_datadogagentinternals.yaml +++ b/config/crd/bases/v1/datadoghq.com_datadogagentinternals.yaml @@ -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: |- diff --git a/config/crd/bases/v1/datadoghq.com_datadogagentinternals_v1alpha1.json b/config/crd/bases/v1/datadoghq.com_datadogagentinternals_v1alpha1.json index 41fb9c72c7..367742d25b 100644 --- a/config/crd/bases/v1/datadoghq.com_datadogagentinternals_v1alpha1.json +++ b/config/crd/bases/v1/datadoghq.com_datadogagentinternals_v1alpha1.json @@ -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": { diff --git a/config/crd/bases/v1/datadoghq.com_datadogagentprofiles.yaml b/config/crd/bases/v1/datadoghq.com_datadogagentprofiles.yaml index 55136a9bc9..d9f0be8310 100644 --- a/config/crd/bases/v1/datadoghq.com_datadogagentprofiles.yaml +++ b/config/crd/bases/v1/datadoghq.com_datadogagentprofiles.yaml @@ -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: |- diff --git a/config/crd/bases/v1/datadoghq.com_datadogagentprofiles_v1alpha1.json b/config/crd/bases/v1/datadoghq.com_datadogagentprofiles_v1alpha1.json index 39c625ab50..26d45bd8a9 100644 --- a/config/crd/bases/v1/datadoghq.com_datadogagentprofiles_v1alpha1.json +++ b/config/crd/bases/v1/datadoghq.com_datadogagentprofiles_v1alpha1.json @@ -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": { diff --git a/config/crd/bases/v1/datadoghq.com_datadogagents.yaml b/config/crd/bases/v1/datadoghq.com_datadogagents.yaml index 759a0e128f..2e522cbf9d 100644 --- a/config/crd/bases/v1/datadoghq.com_datadogagents.yaml +++ b/config/crd/bases/v1/datadoghq.com_datadogagents.yaml @@ -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: |- diff --git a/config/crd/bases/v1/datadoghq.com_datadogagents_v1alpha1.json b/config/crd/bases/v1/datadoghq.com_datadogagents_v1alpha1.json index 21bb2d18d6..5e46211d69 100644 --- a/config/crd/bases/v1/datadoghq.com_datadogagents_v1alpha1.json +++ b/config/crd/bases/v1/datadoghq.com_datadogagents_v1alpha1.json @@ -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": { @@ -11374,4 +11374,4 @@ } }, "type": "object" -} \ No newline at end of file +} diff --git a/config/crd/bases/v1/datadoghq.com_datadogagents_v2alpha1.json b/config/crd/bases/v1/datadoghq.com_datadogagents_v2alpha1.json index 0f1d413865..7976e800d0 100644 --- a/config/crd/bases/v1/datadoghq.com_datadogagents_v2alpha1.json +++ b/config/crd/bases/v1/datadoghq.com_datadogagents_v2alpha1.json @@ -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": { diff --git a/internal/controller/datadogagent/controller_v2_test.go b/internal/controller/datadogagent/controller_v2_test.go index bfe508e2fe..dcc144a501 100644 --- a/internal/controller/datadogagent/controller_v2_test.go +++ b/internal/controller/datadogagent/controller_v2_test.go @@ -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) }, }, @@ -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) }, }, @@ -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) }, }, @@ -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) }, }, diff --git a/pkg/images/images.go b/pkg/images/images.go index bf5bc21b0c..824b466a85 100644 --- a/pkg/images/images.go +++ b/pkg/images/images.go @@ -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" diff --git a/pkg/images/images_test.go b/pkg/images/images_test.go index 7da44eec80..ffaa41433e 100644 --- a/pkg/images/images_test.go +++ b/pkg/images/images_test.go @@ -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 { @@ -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 { @@ -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", @@ -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 {