Merge pull request #42297 from YuPengZTE/devErrorf

Automatic merge from submit-queue (batch tested with PRs 42237, 42297, 42279, 42436, 42551)

should replace errors.New(fmt.Sprintf(...)) with fmt.Errorf(...)

Signed-off-by: yupengzte <yu.peng36@zte.com.cn>



**What this PR does / why we need it**:

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
```
This commit is contained in:
Kubernetes Submit Queue 2017-03-24 14:16:23 -07:00 committed by GitHub
commit fb537762fc
4 changed files with 4 additions and 5 deletions

View File

@ -169,7 +169,7 @@ func (c *MesosCloud) Master(clusterName string) (string, error) {
return host, nil
}
}
return "", errors.New(fmt.Sprintf("The supplied cluster '%v' does not exist", clusterName))
return "", fmt.Errorf("The supplied cluster '%v' does not exist", clusterName)
}
// ipAddress returns an IP address of the specified instance.

View File

@ -125,7 +125,7 @@ func (util *ISCSIUtil) AttachDisk(b iscsiDiskMounter) error {
if iscsiTransport == "" {
glog.Errorf("iscsi: could not find transport name in iface %s", b.iface)
return errors.New(fmt.Sprintf("Could not parse iface file for %s", b.iface))
return fmt.Errorf("Could not parse iface file for %s", b.iface)
} else if iscsiTransport == "tcp" {
devicePath = strings.Join([]string{"/dev/disk/by-path/ip", tp, "iscsi", b.iqn, "lun", b.lun}, "-")
} else {

View File

@ -20,7 +20,6 @@ import (
"bytes"
"context"
"encoding/json"
"errors"
"fmt"
"io"
"io/ioutil"
@ -1848,7 +1847,7 @@ func getUDData(jpgExpected string, ns string) func(clientset.Interface, string)
if strings.Contains(data.Image, jpgExpected) {
return nil
} else {
return errors.New(fmt.Sprintf("data served up in container is inaccurate, %s didn't contain %s", data, jpgExpected))
return fmt.Errorf("data served up in container is inaccurate, %s didn't contain %s", data, jpgExpected)
}
}
}

View File

@ -82,7 +82,7 @@ func check(options ...string) []error {
errs = appendNotNil(errs, kernel())
default:
fmt.Printf("Unrecognized option %s", c)
errs = append(errs, errors.New(fmt.Sprintf("Unrecognized option %s", c)))
errs = append(errs, fmt.Errorf("Unrecognized option %s", c))
}
}
return errs