add support for bumping AR registries

kubernetes · Jun 6, 2023 · 6408779 · 6408779
1 parent 71151e3
commit 6408779
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/experiment/image-bumper/bumper/bumper.go b/experiment/image-bumper/bumper/bumper.go
@@ -29,7 +29,7 @@ import (
 )
 
 var (
-	imageRegexp = regexp.MustCompile(`\b((?:[a-z0-9]+\.)?gcr\.io)/([a-z][a-z0-9-]{5,29}/[a-zA-Z0-9][a-zA-Z0-9_./-]+):([a-zA-Z0-9_.-]+)\b`)
+	imageRegexp = regexp.MustCompile(`\b((?:[a-z0-9]+\.)?gcr\.io|(?:[a-z0-9]+\-)?docker\.pkg\.dev)/([a-z][a-z0-9-]{5,29}/[a-zA-Z0-9][a-zA-Z0-9_./-]+):([a-zA-Z0-9_.-]+)\b`)
 	tagRegexp   = regexp.MustCompile(`(v?\d{8}-(?:v\d(?:[.-]\d+)*-g)?[0-9a-f]{6,10}|latest)(-.+)?`)
 )
 
@@ -68,11 +68,11 @@ var commitRegexp = regexp.MustCompile(`^g?([\da-f]+)|(.+?)??(?:-(\d+)-g([\da-f]+
 
 // DeconstructCommit separates a git describe commit into its parts.
 
-//
 // Examples:
-//  v0.0.30-14-gdeadbeef => (v0.0.30 14 deadbeef)
-//  v0.0.30 => (v0.0.30 0 "")
-//  deadbeef => ("", 0, deadbeef)
+//
+//	v0.0.30-14-gdeadbeef => (v0.0.30 14 deadbeef)
+//	v0.0.30 => (v0.0.30 0 "")
+//	deadbeef => ("", 0, deadbeef)
 //
 // See man git describe.
 func DeconstructCommit(commit string) (string, int, string) {

diff --git a/experiment/image-bumper/bumper/bumper_test.go b/experiment/image-bumper/bumper/bumper_test.go
@@ -329,6 +329,14 @@ func TestUpdateAllTags(t *testing.T) {
 				"eu.gcr.io/k8s-testimages/some-image:v20190404-12345678": "v20190405-123456789",
 			},
 		},
+		{
+			name:           "AR subdomains are supported",
+			content:        `{"images": ["us-docker.pkg.dev/k8s-testimages/some-image:v20190404-12345678"]}`,
+			expectedResult: `{"images": ["us-docker.pkg.dev/k8s-testimages/some-image:v20190405-123456789"]}`,
+			newTags: map[string]string{
+				"us-docker.pkg.dev/k8s-testimages/some-image:v20190404-12345678": "v20190405-123456789",
+			},
+		},
 		{
 			name:           "images not matching the filter regex are not updated",
 			content:        `{"images": ["gcr.io/k8s-prow/prow-thing:v20190404-12345678", "gcr.io/k8s-testimages/some-image:v20190404-12345678"]}`,