github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-12 18:18:51 +00:00
Code Issues Projects Releases Wiki Activity

update more commands for iostreams

Browse Source
This commit is contained in:
David Eads
2018-04-25 08:32:08 -04:00
parent 3fb88a23d9
commit 8c1b687356
24 changed files with 241 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/kubectl/cmd/set/set_selector.go
View File

@@ -18,7 +18,6 @@ package set
import (
"fmt"
"io"
"k8s.io/kubernetes/pkg/printers"
@@ -53,7 +52,6 @@ type SetSelectorOptions struct {
resources []string
selector *metav1.LabelSelector
out io.Writer
ClientForMapping func(mapping *meta.RESTMapping) (resource.RESTClient, error)
PrintObj printers.ResourcePrinterFunc
@@ -61,6 +59,8 @@ type SetSelectorOptions struct {
builder *resource.Builder
mapper meta.RESTMapper
genericclioptions.IOStreams
}
var (
@@ -77,20 +77,20 @@ var (
kubectl create deployment my-dep -o yaml --dry-run | kubectl label --local -f - environment=qa -o yaml | kubectl create -f -`)
)
func NewSelectorOptions(out io.Writer) *SetSelectorOptions {
func NewSelectorOptions(streams genericclioptions.IOStreams) *SetSelectorOptions {
return &SetSelectorOptions{
PrintFlags: printers.NewPrintFlags("selector updated"),
RecordFlags: genericclioptions.NewRecordFlags(),
Recorder: genericclioptions.NoopRecorder{},
out: out,
IOStreams: streams,
}
}
// NewCmdSelector is the "set selector" command.
func NewCmdSelector(f cmdutil.Factory, out io.Writer) *cobra.Command {
o := NewSelectorOptions(out)
func NewCmdSelector(f cmdutil.Factory, streams genericclioptions.IOStreams) *cobra.Command {
o := NewSelectorOptions(streams)
cmd := &cobra.Command{
Use: "selector (-f FILENAME | TYPE NAME) EXPRESSIONS [--resource-version=version]",
@@ -226,7 +226,7 @@ func (o *SetSelectorOptions) RunSelector() error {
return patch.Err
}
if o.local || o.dryrun {
return o.PrintObj(info.Object, o.out)
return o.PrintObj(info.Object, o.Out)
}
patched, err := resource.NewHelper(info.Client, info.Mapping).Patch(info.Namespace, info.Name, types.StrategicMergePatchType, patch.Patch)
@@ -235,7 +235,7 @@ func (o *SetSelectorOptions) RunSelector() error {
}
info.Refresh(patched, true)
return o.PrintObj(patch.Info.AsVersioned(), o.out)
return o.PrintObj(patch.Info.AsVersioned(), o.Out)
})
}