github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 07:27:21 +00:00
Code Issues Projects Releases Wiki Activity

remove unnecessarily flexibiliy to simplify the resource builder

Browse Source
This commit is contained in:
David Eads
2018-04-27 08:40:57 -04:00
parent 61fdd880b2
commit 6fbcbc994f
33 changed files with 154 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/kubectl/cmd/drain.go
View File

@@ -283,7 +283,7 @@ func (o *DrainOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args []st
}
builder := f.NewBuilder().
Internal().
Internal(legacyscheme.Scheme).
NamespaceParam(o.Namespace).DefaultNamespace().
ResourceNames("nodes", args...).
SingleResourceType().
@@ -741,7 +741,7 @@ func (o *DrainOptions) RunCordonOrUncordon(desired bool) error {
fmt.Printf("error: %v", err)
continue
}
printer.PrintObj(nodeInfo.AsVersioned(), o.Out)
printer.PrintObj(nodeInfo.AsVersioned(legacyscheme.Scheme), o.Out)
} else {
if !o.DryRun {
helper := resource.NewHelper(o.restClient, nodeInfo.Mapping)
@@ -767,7 +767,7 @@ func (o *DrainOptions) RunCordonOrUncordon(desired bool) error {
fmt.Fprintf(o.ErrOut, "%v", err)
continue
}
printer.PrintObj(nodeInfo.AsVersioned(), o.Out)
printer.PrintObj(nodeInfo.AsVersioned(legacyscheme.Scheme), o.Out)
}
} else {
printer, err := o.ToPrinter("skipped")
@@ -775,7 +775,7 @@ func (o *DrainOptions) RunCordonOrUncordon(desired bool) error {
fmt.Fprintf(o.ErrOut, "%v", err)
continue
}
printer.PrintObj(nodeInfo.AsVersioned(), o.Out)
printer.PrintObj(nodeInfo.AsVersioned(legacyscheme.Scheme), o.Out)
}
}