fix(fleet): Ignore public.ecr.aws overrides

DataDog · Nov 6, 2024 · 2fb61d7 · 2fb61d7
1 parent eb4fbb5
commit 2fb61d7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/pkg/fleet/internal/oci/download.go b/pkg/fleet/internal/oci/download.go
@@ -73,7 +73,6 @@ var (
 	defaultRegistriesProd = []string{
 		"install.datadoghq.com",
 		"gcr.io/datadoghq",
-		"public.ecr.aws/datadog",
 		"docker.io/datadog",
 	}
 )
@@ -210,7 +209,8 @@ func getRefAndKeychain(env *env.Env, url string) urlWithKeychain {
 		}
 	}
 	ref := url
-	if registryOverride != "" {
+	// public.ecr.aws/datadog is ignored for now as there are issues with it
+	if registryOverride != "" && registryOverride != "public.ecr.aws/datadog" {
 		if !strings.HasSuffix(registryOverride, "/") {
 			registryOverride += "/"
 		}

diff --git a/pkg/fleet/internal/oci/download_test.go b/pkg/fleet/internal/oci/download_test.go
@@ -279,7 +279,6 @@ func TestGetRefAndKeychains(t *testing.T) {
 			expectedRefAndKeychains: []urlWithKeychain{
 				{ref: "install.datadoghq.com/agent-package@sha256:1234", keychain: authn.DefaultKeychain},
 				{ref: "gcr.io/datadoghq/agent-package@sha256:1234", keychain: authn.DefaultKeychain},
-				{ref: "public.ecr.aws/datadog/agent-package@sha256:1234", keychain: authn.DefaultKeychain},
 				{ref: "docker.io/datadog/agent-package@sha256:1234", keychain: authn.DefaultKeychain},
 			},
 		},
@@ -291,7 +290,6 @@ func TestGetRefAndKeychains(t *testing.T) {
 				{ref: "mysuperregistry.tv/agent-package@sha256:1234", keychain: authn.DefaultKeychain},
 				{ref: "install.datadoghq.com/agent-package@sha256:1234", keychain: authn.DefaultKeychain},
 				{ref: "gcr.io/datadoghq/agent-package@sha256:1234", keychain: authn.DefaultKeychain},
-				{ref: "public.ecr.aws/datadog/agent-package@sha256:1234", keychain: authn.DefaultKeychain},
 				{ref: "docker.io/datadog/agent-package@sha256:1234", keychain: authn.DefaultKeychain},
 			},
 		},
@@ -305,7 +303,6 @@ func TestGetRefAndKeychains(t *testing.T) {
 				{ref: "mysuperregistry.tv/agent-package@sha256:1234", keychain: google.Keychain},
 				{ref: "install.datadoghq.com/agent-package@sha256:1234", keychain: authn.DefaultKeychain},
 				{ref: "gcr.io/datadoghq/agent-package@sha256:1234", keychain: authn.DefaultKeychain},
-				{ref: "public.ecr.aws/datadog/agent-package@sha256:1234", keychain: authn.DefaultKeychain},
 				{ref: "docker.io/datadog/agent-package@sha256:1234", keychain: authn.DefaultKeychain},
 			},
 		},

diff --git a/test/new-e2e/tests/installer/windows/suites/agent-package/upgrade_test.go b/test/new-e2e/tests/installer/windows/suites/agent-package/upgrade_test.go
@@ -46,7 +46,7 @@ func (s *testAgentUpgradeSuite) TestDowngradeAgentPackage() {
 
 	// Act
 	_, err = s.Installer().InstallExperiment(installerwindows.AgentPackage,
-		installer.WithRegistry("public.ecr.aws/datadog"),
+		installer.WithRegistry("install.datadoghq.com"),
 		installer.WithVersion(s.StableAgentVersion().PackageVersion()),
 		installer.WithAuthentication(""),
 	)
@@ -69,7 +69,7 @@ func (s *testAgentUpgradeSuite) TestExperimentFailure() {
 
 	// Act
 	_, err := s.Installer().InstallExperiment(installerwindows.AgentPackage,
-		installer.WithRegistry("public.ecr.aws/datadog"),
+		installer.WithRegistry("install.datadoghq.com"),
 		installer.WithVersion("unknown-version"),
 		installer.WithAuthentication(""),
 	)
@@ -88,7 +88,7 @@ func (s *testAgentUpgradeSuite) TestExperimentCurrentVersion() {
 
 	// Act
 	_, err := s.Installer().InstallExperiment(installerwindows.AgentPackage,
-		installer.WithRegistry("public.ecr.aws/datadog"),
+		installer.WithRegistry("install.datadoghq.com"),
 		installer.WithVersion(s.StableAgentVersion().PackageVersion()),
 		installer.WithAuthentication(""),
 	)
@@ -121,7 +121,7 @@ func (s *testAgentUpgradeSuite) installStableAgent() {
 
 	// Act
 	output, err := s.Installer().InstallPackage(installerwindows.AgentPackage,
-		installer.WithRegistry("public.ecr.aws/datadog"),
+		installer.WithRegistry("install.datadoghq.com"),
 		installer.WithVersion(s.StableAgentVersion().PackageVersion()),
 		installer.WithAuthentication(""),
 	)