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

Merge pull request #8173 from brendandburns/kubectl

Browse Source 
Fix a bug where IgnoreErrors was inverted.
This commit is contained in:
Clayton Coleman 2015-05-14 10:18:12 -04:00
commit aec4196741
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubectl/cmd/rollingupdate.go
View File

@ -22,6 +22,8 @@ import (
"io" "io"
"os" "os"
"github.com/golang/glog"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api" "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors"
"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl" "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl"
@ -161,6 +163,10 @@ func RunRollingUpdate(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, arg
var ok bool var ok bool
newRc, ok = obj.(*api.ReplicationController) newRc, ok = obj.(*api.ReplicationController)
if !ok { if !ok {
if _, kind, err := typer.ObjectVersionAndKind(obj); err == nil {
return cmdutil.UsageError(cmd, "%s contains a %s not a ReplicationController", filename, kind)
}
glog.V(4).Infof("Object %#v is not a ReplicationController", obj)
return cmdutil.UsageError(cmd, "%s does not specify a valid ReplicationController", filename) return cmdutil.UsageError(cmd, "%s does not specify a valid ReplicationController", filename)
} }
} }

4
pkg/kubectl/resource/visitor.go
View File

@ -217,7 +217,7 @@ func (v *PathVisitor) Visit(fn VisitorFunc) error {
} }
info, err := v.Mapper.InfoForData(data, v.Path) info, err := v.Mapper.InfoForData(data, v.Path)
if err != nil { if err != nil {
if v.IgnoreErrors { if !v.IgnoreErrors {
return err return err
} }
glog.V(2).Infof("Unable to load file %q: %v", v.Path, err) glog.V(2).Infof("Unable to load file %q: %v", v.Path, err)
@ -280,7 +280,7 @@ func (v *DirectoryVisitor) Visit(fn VisitorFunc) error {
} }
info, err := v.Mapper.InfoForData(data, path) info, err := v.Mapper.InfoForData(data, path)
if err != nil { if err != nil {
if v.IgnoreErrors { if !v.IgnoreErrors {
return err return err
} }
glog.V(2).Infof("Unable to load file %q: %v", path, err) glog.V(2).Infof("Unable to load file %q: %v", path, err)