github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-07 04:03:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #100177 from wangyx1992/wrapped-error

Browse Source 
fix errors in wrapped format
This commit is contained in:
Kubernetes Prow Robot
2021-04-13 23:24:42 -07:00
committed by GitHub
parent 6cc27991e9 34c2b2360b
commit 3c20c5aa2f
6 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/credentialprovider/plugin/config.go
View File

@@ -35,12 +35,12 @@ func readCredentialProviderConfigFile(configPath string) (*kubeletconfig.Credent
data, err := ioutil.ReadFile(configPath)
if err != nil {
return nil, fmt.Errorf("unable to read external registry credential provider configuration from %q: %v", configPath, err)
return nil, fmt.Errorf("unable to read external registry credential provider configuration from %q: %w", configPath, err)
}
config, err := decode(data)
if err != nil {
return nil, fmt.Errorf("error decoding config %s: %v", configPath, err)
return nil, fmt.Errorf("error decoding config %s: %w", configPath, err)
}
return config, nil

4
pkg/credentialprovider/plugin/plugin.go
View File

@@ -328,7 +328,7 @@ func (e *execPlugin) ExecPlugin(ctx context.Context, image string) (*credentialp
authRequest := &credentialproviderapi.CredentialProviderRequest{Image: image}
data, err := e.encodeRequest(authRequest)
if err != nil {
return nil, fmt.Errorf("failed to encode auth request: %v", err)
return nil, fmt.Errorf("failed to encode auth request: %w", err)
}
stdout := &bytes.Buffer{}
@@ -385,7 +385,7 @@ func (e *execPlugin) ExecPlugin(ctx context.Context, image string) (*credentialp
func (e *execPlugin) encodeRequest(request *credentialproviderapi.CredentialProviderRequest) ([]byte, error) {
data, err := runtime.Encode(e.encoder, request)
if err != nil {
return nil, fmt.Errorf("error encoding request: %v", err)
return nil, fmt.Errorf("error encoding request: %w", err)
}
return data, nil