From f9f84553324ef35015b4e0b7880489a07e1e7622 Mon Sep 17 00:00:00 2001 From: Maksym Pavlenko Date: Tue, 17 Jan 2023 14:36:21 -0800 Subject: [PATCH] Backport #7393 to sbserver Signed-off-by: Maksym Pavlenko --- pkg/cri/sbserver/image_pull.go | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/pkg/cri/sbserver/image_pull.go b/pkg/cri/sbserver/image_pull.go index 29e2cd403..fe4770240 100644 --- a/pkg/cri/sbserver/image_pull.go +++ b/pkg/cri/sbserver/image_pull.go @@ -425,7 +425,7 @@ func (c *criService) registryHosts(ctx context.Context, auth *runtime.AuthConfig if err != nil { return nil, fmt.Errorf("get TLSConfig for registry %q: %w", e, err) } - } else if isLocalHost(host) && u.Scheme == "http" { + } else if docker.IsLocalhost(host) && u.Scheme == "http" { // Skipping TLS verification for localhost transport.TLSClientConfig = &tls.Config{ InsecureSkipVerify: true, @@ -470,26 +470,12 @@ func (c *criService) registryHosts(ctx context.Context, auth *runtime.AuthConfig // defaultScheme returns the default scheme for a registry host. func defaultScheme(host string) string { - if isLocalHost(host) { + if docker.IsLocalhost(host) { return "http" } return "https" } -// isLocalHost checks if the registry host is local. -func isLocalHost(host string) bool { - if h, _, err := net.SplitHostPort(host); err == nil { - host = h - } - - if host == "localhost" { - return true - } - - ip := net.ParseIP(host) - return ip.IsLoopback() -} - // addDefaultScheme returns the endpoint with default scheme func addDefaultScheme(endpoint string) (string, error) { if strings.Contains(endpoint, "://") {