github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-17 15:50:10 +00:00
Code Issues Projects Releases Wiki Activity

fmt.Errorf replaces errors

Browse Source
This commit is contained in:
zhangxiaoyu-zidif 2017-05-09 06:26:45 +08:00
parent b33c8153eb
commit 276a272a91
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubectl/rolling_updater.go
View File

@ -17,7 +17,6 @@ limitations under the License.
package kubectl package kubectl
import ( import (
goerrors "errors"
"fmt" "fmt"
"io" "io"
"strconv" "strconv"
@ -616,11 +615,11 @@ func CreateNewControllerFromCurrentController(rcClient coreclient.ReplicationCon
} }
if len(newRc.Spec.Template.Spec.Containers) > 1 && len(cfg.Container) == 0 { if len(newRc.Spec.Template.Spec.Containers) > 1 && len(cfg.Container) == 0 {
return nil, goerrors.New("Must specify container to update when updating a multi-container pod") return nil, fmt.Errorf("must specify container to update when updating a multi-container pod")
} }
if len(newRc.Spec.Template.Spec.Containers) == 0 { if len(newRc.Spec.Template.Spec.Containers) == 0 {
return nil, goerrors.New(fmt.Sprintf("Pod has no containers! (%v)", newRc)) return nil, fmt.Errorf("pod has no containers! (%v)", newRc)
} }
newRc.Spec.Template.Spec.Containers[containerIndex].Image = cfg.Image newRc.Spec.Template.Spec.Containers[containerIndex].Image = cfg.Image
if len(cfg.PullPolicy) != 0 { if len(cfg.PullPolicy) != 0 {