github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #103037 from navist2020/cleanup/WrapfToErrorf

Browse Source 
Use errors.Errorf instead of errors.Wrapf when the err is nil
This commit is contained in:
Kubernetes Prow Robot
2021-06-21 10:07:02 -07:00
committed by GitHub
parent 0f4fd721e5 1f9d448283
commit e1628dac4a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/cmd/phases/workflow/runner.go
View File

@@ -213,7 +213,7 @@ func (e *Runner) Run(args []string) error {
// Errors if phases that are meant to create special subcommands only // Errors if phases that are meant to create special subcommands only
// are wrongly assigned Run Methods // are wrongly assigned Run Methods
if p.RunAllSiblings && (p.RunIf != nil || p.Run != nil) { if p.RunAllSiblings && (p.RunIf != nil || p.Run != nil) {
return errors.Wrapf(err, "phase marked as RunAllSiblings can not have Run functions %s", p.generatedName) return errors.Errorf("phase marked as RunAllSiblings can not have Run functions %s", p.generatedName)
} }
// If the phase defines a condition to be checked before executing the phase action. // If the phase defines a condition to be checked before executing the phase action.