github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #1449 from mikebrow/make-http-with-tlsconfig-a-warning

Browse Source 
removes the error when tls is configured for https but http is tried first
This commit is contained in:
Derek McGowan 2020-05-10 16:09:41 -07:00 committed by GitHub
commit dbedcf8706
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/server/image_pull.go
View File

@ -324,10 +324,6 @@ func (c *criService) registryHosts(auth *runtime.AuthConfig) docker.RegistryHost
config = c.config.Registry.Configs[u.Host] config = c.config.Registry.Configs[u.Host]
) )
if u.Scheme != "https" && config.TLS != nil {
return nil, errors.Errorf("tls provided for http endpoint %q", e)
}
if config.TLS != nil { if config.TLS != nil {
transport.TLSClientConfig, err = c.getTLSConfig(*config.TLS) transport.TLSClientConfig, err = c.getTLSConfig(*config.TLS)
if err != nil { if err != nil {