fluxcd
/
source-controller
mirror of https://github.com/fluxcd/source-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

include Secret name in returned errors 

Signed-off-by: Max Jonas Werner <mail@makk.es>
This commit is contained in:
Max Jonas Werner 2022-05-24 10:30:32 +02:00
parent 7cfd94effb
commit bb569bec1f
No known key found for this signature in database
GPG Key ID: EB525E0F02B52140
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
internal/helm/registry/auth.go
View File

@ -19,15 +19,16 @@ func LoginOptionFromSecret(registryURL string, secret corev1.Secret) (registry.L
if secret.Type == corev1.SecretTypeDockerConfigJson { if secret.Type == corev1.SecretTypeDockerConfigJson {
dockerCfg, err := config.LoadFromReader(bytes.NewReader(secret.Data[corev1.DockerConfigJsonKey])) dockerCfg, err := config.LoadFromReader(bytes.NewReader(secret.Data[corev1.DockerConfigJsonKey]))
if err != nil { if err != nil {
return nil, fmt.Errorf("unable to load Docker config: %w", err) return nil, fmt.Errorf("unable to load Docker config from Secret '%s': %w", secret.Name, err)
} }
parsedURL, err := url.Parse(registryURL) parsedURL, err := url.Parse(registryURL)
if err != nil { if err != nil {
return nil, fmt.Errorf("unable to parse registry URL: %w", err) return nil, fmt.Errorf("unable to parse registry URL '%s' while reconciling Secret '%s': %w",
registryURL, secret.Name, err)
} }
authConfig, err := dockerCfg.GetAuthConfig(parsedURL.Host) authConfig, err := dockerCfg.GetAuthConfig(parsedURL.Host)
if err != nil { if err != nil {
return nil, fmt.Errorf("unable to get authentication data from Secret: %w", err) return nil, fmt.Errorf("unable to get authentication data from Secret '%s': %w", secret.Name, err)
} }
username = authConfig.Username username = authConfig.Username
password = authConfig.Password password = authConfig.Password