GCB project IDs guessing to support Artifact Registry (#6093)

GoogleContainerTools · Jun 28, 2021 · 7dad6fa · 7dad6fa
1 parent e85b2f8
commit 7dad6fa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/pkg/skaffold/gcp/projectid.go b/pkg/skaffold/gcp/projectid.go
@@ -32,7 +32,7 @@ func ExtractProjectID(imageName string) (string, error) {
 	}
 
 	registry := ref.Context().Registry.Name()
-	if registry == "gcr.io" || strings.HasSuffix(registry, ".gcr.io") {
+	if registry == "gcr.io" || strings.HasSuffix(registry, ".gcr.io") || strings.HasSuffix(registry, "-docker.pkg.dev") {
 		parts := strings.Split(imageName, "/")
 		if len(parts) >= 2 {
 			return parts[1], nil

diff --git a/pkg/skaffold/gcp/projectid_test.go b/pkg/skaffold/gcp/projectid_test.go
@@ -39,6 +39,11 @@ func TestExtractProjectID(t *testing.T) {
 			imageName:   "gcr.io/project/image",
 			expected:    "project",
 		},
+		{
+			description: "us-east1-docker.pkg.dev",
+			imageName:   "us-east1-docker.pkg.dev/project/yyy/go-hello-world:latest",
+			expected:    "project",
+		},
 		{
 			description: "docker hub",
 			imageName:   "project/image",