admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix registry public hub search (#2110)

Browse Source
This commit is contained in:
zryfish
2020-05-25 14:21:18 +08:00
committed by GitHub
parent bb94d6da24
commit 48db63b91f
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
pkg/models/registries/registries.go
View File

@@ -112,16 +112,19 @@ func (c *registryGetter) getEntryBySecret(namespace, secretName, imageName strin
Message: "", Message: "",
} }
var config *DockerConfigEntry
if namespace == "" || secretName == "" { if namespace == "" || secretName == "" {
return failedImageDetails, fmt.Errorf("namespace or secret name not provided") config = &DockerConfigEntry{}
} } else {
secret, err := c.informers.Core().V1().Secrets().Lister().Secrets(namespace).Get(secretName) secret, err := c.informers.Core().V1().Secrets().Lister().Secrets(namespace).Get(secretName)
if err != nil { if err != nil {
return failedImageDetails, err return failedImageDetails, err
} }
entry, err := getDockerEntryFromDockerSecret(secret) config, err = getDockerEntryFromDockerSecret(secret)
if err != nil { if err != nil {
return failedImageDetails, err return failedImageDetails, err
}
} }
// default use ssl // default use ssl
@@ -147,10 +150,10 @@ func (c *registryGetter) getEntryBySecret(namespace, secretName, imageName strin
return failedImageDetails, err return failedImageDetails, err
} }
useSSL := checkSSl(entry.ServerAddress) useSSL := checkSSl(config.ServerAddress)
// Create the registry client. // 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 { if err != nil {
return failedImageDetails, err return failedImageDetails, err
} }