Merge pull request #1621 from zhsj/bpo-containerd-4987

mikebrow · web-flow · commit b4b894c87186 · 2021-02-25T15:26:07.000-06:00
[release/1.4] Fix deprecated registry auth conversion
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -18,6 +18,7 @@ package config
 
 import (
 	"context"
+	"net/url"
 	"time"
 
 	"github.com/BurntSushi/toml"
@@ -352,6 +353,15 @@ func ValidatePluginConfig(ctx context.Context, c *PluginConfig) error {
 			c.Registry.Configs = make(map[string]RegistryConfig)
 		}
 		for endpoint, auth := range c.Registry.Auths {
+			auth := auth
+			u, err := url.Parse(endpoint)
+			if err != nil {
+				return errors.Wrapf(err, "failed to parse registry url %q from `registry.auths`", endpoint)
+			}
+			if u.Scheme != "" {
+				// Do not include the scheme in the new registry config.
+				endpoint = u.Host
+			}
 			config := c.Registry.Configs[endpoint]
 			config.Auth = &auth
 			c.Registry.Configs[endpoint] = config
diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go
@@ -294,7 +294,7 @@ func TestValidateConfig(t *testing.T) {
 				},
 				Registry: Registry{
 					Configs: map[string]RegistryConfig{
-						"https://gcr.io": {
+						"gcr.io": {
 							Auth: &AuthConfig{
 								Username: "test",
 							},
