Add required changes after merge

Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com>

pkg/registry/client.go

@@ -87,6 +87,8 @@ func NewClient(options ...ClientOption) (*Client, error) {
 		}
 		client.authorizer = authClient
 	}
+
+	if client.resolver == nil {
 		client.resolver = func(ref registry.Reference) (remotes.Resolver, error) {
 			headers := http.Header{}
 			headers.Set("User-Agent", version.GetUserAgent())
@@ -117,6 +119,8 @@ func NewClient(options ...ClientOption) (*Client, error) {
 			}
 			return resolver, nil
 		}
+	}
+
 	// allocate a cache if option is set
 	var cache registryauth.Cache
 	if client.enableCache {
@@ -202,7 +206,9 @@ func ClientOptPlainHTTP() ClientOption {
 // ClientOptResolver returns a function that sets the resolver setting on a client options set
 func ClientOptResolver(resolver remotes.Resolver) ClientOption {
 	return func(client *Client) {
-		client.resolver = resolver
+		client.resolver = func(ref registry.Reference) (remotes.Resolver, error) {
+			return resolver, nil
+		}
 	}
 }