fix rebase of 1.13.1-rc2

Signed-off-by: Antonio Murdaca <runcom@redhat.com>

Author: runcom

cli/command/plugin/install.go

@@ -98,11 +98,6 @@ func buildPullConfig(ctx context.Context, dockerCli *command.DockerCli, opts plu
 		return types.PluginInstallOptions{}, err
 	}
 
-	index, err := getRepoIndexFromUnnormalizedRef(ref)
-	if err != nil {
-		return types.PluginInstallOptions{}, err
-	}
-
 	repoInfoIndex, err := getRepoIndexFromUnnormalizedRef(ref)
 	if err != nil {
 		return types.PluginInstallOptions{}, err
@@ -136,7 +131,7 @@ func buildPullConfig(ctx context.Context, dockerCli *command.DockerCli, opts plu
 
 	dockerRef, err := reference.ParseNamed(ref.Name())
 	if err != nil {
-		return err
+		return types.PluginInstallOptions{}, err
 	}
 	encodedAuth, err := command.GetEncodedAuth(dockerCli, dockerRef)
 	if err != nil {

plugin/backend_linux.go

@@ -251,10 +251,20 @@ func (pm *Manager) Upgrade(ctx context.Context, ref reference.Named, name string
 		blobStore: pm.blobStore,
 	}
 
+	repoInfo, err := registry.ParseRepositoryInfo(ref)
+	if err != nil {
+		return err
+	}
+	auths := make(map[string]types.AuthConfig)
+	authConfigKey := registry.GetAuthConfigKey(repoInfo.Index)
+	if authConfig != nil {
+		auths[authConfigKey] = *authConfig
+	}
+
 	pluginPullConfig := &distribution.ImagePullConfig{
 		Config: distribution.Config{
 			MetaHeaders:      metaHeader,
-			AuthConfig:       authConfig,
+			AuthConfigs:      auths,
 			RegistryService:  pm.config.RegistryService,
 			ImageEventLogger: pm.config.LogPluginEvent,
 			ImageStore:       dm,