From 48db63b91f3481a183b5f52768c0e307750b16c1 Mon Sep 17 00:00:00 2001 From: zryfish Date: Mon, 25 May 2020 14:21:18 +0800 Subject: [PATCH] fix registry public hub search (#2110) --- pkg/models/registries/registries.go | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkg/models/registries/registries.go b/pkg/models/registries/registries.go index e176a1090..bad70fa63 100644 --- a/pkg/models/registries/registries.go +++ b/pkg/models/registries/registries.go @@ -112,16 +112,19 @@ func (c *registryGetter) getEntryBySecret(namespace, secretName, imageName strin Message: "", } + var config *DockerConfigEntry + if namespace == "" || secretName == "" { - return failedImageDetails, fmt.Errorf("namespace or secret name not provided") - } - secret, err := c.informers.Core().V1().Secrets().Lister().Secrets(namespace).Get(secretName) - if err != nil { - return failedImageDetails, err - } - entry, err := getDockerEntryFromDockerSecret(secret) - if err != nil { - return failedImageDetails, err + config = &DockerConfigEntry{} + } else { + secret, err := c.informers.Core().V1().Secrets().Lister().Secrets(namespace).Get(secretName) + if err != nil { + return failedImageDetails, err + } + config, err = getDockerEntryFromDockerSecret(secret) + if err != nil { + return failedImageDetails, err + } } // default use ssl @@ -147,10 +150,10 @@ func (c *registryGetter) getEntryBySecret(namespace, secretName, imageName strin return failedImageDetails, err } - useSSL := checkSSl(entry.ServerAddress) + useSSL := checkSSl(config.ServerAddress) // Create the registry client. - r, err := CreateRegistryClient(entry.Username, entry.Password, image.Domain, useSSL) + r, err := CreateRegistryClient(config.Username, config.Password, image.Domain, useSSL) if err != nil { return failedImageDetails, err }