Merge pull request containerd#6258 from wllenyj/fix-registry-panic

fuweid · web-flow · commit 69822aa936a1 · 2021-11-19T13:35:46.000+08:00
diff --git a/pkg/cri/server/image_pull.go b/pkg/cri/server/image_pull.go
@@ -375,7 +375,9 @@ func (c *criService) registryHosts(ctx context.Context, auth *runtime.AuthConfig
 				}
 			} else if isLocalHost(host) && u.Scheme == "http" {
 				// Skipping TLS verification for localhost
-				transport.TLSClientConfig.InsecureSkipVerify = true
+				transport.TLSClientConfig = &tls.Config{
+					InsecureSkipVerify: true,
+				}
 			}
 
 			// Make a copy of `auth`, so that different authorizers would not reference

Original file line number	Diff line number	Diff line change
`@@ -375,7 +375,9 @@ func (c criService) registryHosts(ctx context.Context, auth runtime.AuthConfig`
`375`	`375`	`}`
`376`	`376`	`} else if isLocalHost(host) && u.Scheme == "http" {`
`377`	`377`	`// Skipping TLS verification for localhost`
`378`		`- transport.TLSClientConfig.InsecureSkipVerify = true`
	`378`	`+ transport.TLSClientConfig = &tls.Config{`
	`379`	`+ InsecureSkipVerify: true,`
	`380`	`+ }`
`379`	`381`	`}`
`380`	`382`
`381`	`383`	// Make a copy of `auth`, so that different authorizers would not reference