Merge pull request #1254 from awesomenix/release/1.2

Random-Liu · web-flow · commit ad5dcc6cba06 · 2019-08-30T10:14:10.000-07:00
[release/1.2] fix: support empty auth config for anonymous registry
diff --git a/pkg/server/image_pull.go b/pkg/server/image_pull.go
@@ -166,7 +166,8 @@ func ParseAuth(auth *runtime.AuthConfig) (string, string, error) {
 		return user, strings.Trim(passwd, "\x00"), nil
 	}
 	// TODO(random-liu): Support RegistryToken.
-	return "", "", errors.New("invalid auth config")
+	// An empty auth config is valid for anonymous registry
+	return "", "", nil
 }
 
 // createImageReference creates image reference inside containerd image store.
diff --git a/pkg/server/image_pull_test.go b/pkg/server/image_pull_test.go
@@ -41,9 +41,9 @@ func TestParseAuth(t *testing.T) {
 		expectErr      bool
 	}{
 		"should not return error if auth config is nil": {},
-		"should return error if no supported auth is provided": {
+		"should not return error if empty auth is provided for access to anonymous registry": {
 			auth:      &runtime.AuthConfig{},
-			expectErr: true,
+			expectErr: false,
 		},
 		"should support identity token": {
 			auth:           &runtime.AuthConfig{IdentityToken: "abcd"},

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,8 @@ func ParseAuth(auth *runtime.AuthConfig) (string, string, error) {`
`166`	`166`	`return user, strings.Trim(passwd, "\x00"), nil`
`167`	`167`	`}`
`168`	`168`	`// TODO(random-liu): Support RegistryToken.`
`169`		`- return "", "", errors.New("invalid auth config")`
	`169`	`+ // An empty auth config is valid for anonymous registry`
	`170`	`+ return "", "", nil`
`170`	`171`	`}`
`171`	`172`
`172`	`173`	`// createImageReference creates image reference inside containerd image store.`