Merge pull request #46643 from neersighted/revert_46631

Revert "Return no basic auth creds error when needed"

daemon/containerd/resolver.go

@@ -11,7 +11,6 @@ import (
 	"github.com/containerd/containerd/remotes/docker"
 	"github.com/containerd/containerd/version"
 	"github.com/containerd/log"
-	"github.com/docker/distribution/registry/client/auth"
 	registrytypes "github.com/docker/docker/api/types/registry"
 	"github.com/docker/docker/dockerversion"
 	"github.com/docker/docker/pkg/useragent"
@@ -76,15 +75,11 @@ func authorizerFromAuthConfig(authConfig registrytypes.AuthConfig) docker.Author
 				"host":    host,
 				"cfgHost": cfgHost,
 			}).Warn("Host doesn't match")
-			return "", "", auth.ErrNoBasicAuthCredentials
+			return "", "", nil
 		}
 		if authConfig.IdentityToken != "" {
 			return "", authConfig.IdentityToken, nil
 		}
-
-		if authConfig.Username == "" && authConfig.Password == "" {
-			return "", "", auth.ErrNoBasicAuthCredentials
-		}
 		return authConfig.Username, authConfig.Password, nil
 	}))
 }