From 862415aaa2bb9898217be8c4a25dc037f190284e Mon Sep 17 00:00:00 2001 From: deads2k Date: Fri, 16 Sep 2016 15:50:34 -0400 Subject: [PATCH] make --include-extended-apis deprecated and remove plumbing --- pkg/kubectl/cmd/annotate.go | 4 ++-- pkg/kubectl/cmd/apply.go | 2 +- pkg/kubectl/cmd/autoscale.go | 2 +- pkg/kubectl/cmd/clusterinfo.go | 2 +- pkg/kubectl/cmd/cmd_test.go | 22 +++++++++++----------- pkg/kubectl/cmd/convert.go | 2 +- pkg/kubectl/cmd/create.go | 2 +- pkg/kubectl/cmd/delete.go | 2 +- pkg/kubectl/cmd/describe.go | 2 +- pkg/kubectl/cmd/drain.go | 4 ++-- pkg/kubectl/cmd/edit.go | 2 +- pkg/kubectl/cmd/explain.go | 2 +- pkg/kubectl/cmd/expose.go | 2 +- pkg/kubectl/cmd/get.go | 2 +- pkg/kubectl/cmd/label.go | 2 +- pkg/kubectl/cmd/logs.go | 2 +- pkg/kubectl/cmd/patch.go | 2 +- pkg/kubectl/cmd/replace.go | 2 +- pkg/kubectl/cmd/rollingupdate.go | 2 +- pkg/kubectl/cmd/rollout/rollout_history.go | 2 +- pkg/kubectl/cmd/rollout/rollout_pause.go | 2 +- pkg/kubectl/cmd/rollout/rollout_resume.go | 2 +- pkg/kubectl/cmd/rollout/rollout_status.go | 2 +- pkg/kubectl/cmd/rollout/rollout_undo.go | 2 +- pkg/kubectl/cmd/run.go | 4 ++-- pkg/kubectl/cmd/scale.go | 2 +- pkg/kubectl/cmd/set/set_image.go | 2 +- pkg/kubectl/cmd/stop.go | 2 +- pkg/kubectl/cmd/taint.go | 4 ++-- pkg/kubectl/cmd/util/factory.go | 11 +++++------ pkg/kubectl/cmd/util/helpers.go | 8 +------- 31 files changed, 49 insertions(+), 56 deletions(-) diff --git a/pkg/kubectl/cmd/annotate.go b/pkg/kubectl/cmd/annotate.go index 24e22f6a9c5..f4915e4ee45 100644 --- a/pkg/kubectl/cmd/annotate.go +++ b/pkg/kubectl/cmd/annotate.go @@ -164,7 +164,7 @@ func (o *AnnotateOptions) Complete(f *cmdutil.Factory, out io.Writer, cmd *cobra o.recordChangeCause = cmdutil.GetRecordFlag(cmd) o.changeCause = f.Command() - mapper, typer := f.Object(cmdutil.GetIncludeThirdPartyAPIs(cmd)) + mapper, typer := f.Object() o.builder = resource.NewBuilder(mapper, typer, resource.ClientMapperFunc(f.ClientForMapping), f.Decoder(true)). ContinueOnError(). NamespaceParam(namespace).DefaultNamespace(). @@ -252,7 +252,7 @@ func (o AnnotateOptions) RunAnnotate() error { return err } - mapper, _ := o.f.Object(cmdutil.GetIncludeThirdPartyAPIs(o.cmd)) + mapper, _ := o.f.Object() outputFormat := cmdutil.GetFlagString(o.cmd, "output") if outputFormat != "" { return o.f.PrintObject(o.cmd, mapper, outputObj, o.out) diff --git a/pkg/kubectl/cmd/apply.go b/pkg/kubectl/cmd/apply.go index 45a46f14e3e..8c2e71949e6 100644 --- a/pkg/kubectl/cmd/apply.go +++ b/pkg/kubectl/cmd/apply.go @@ -114,7 +114,7 @@ func RunApply(f *cmdutil.Factory, cmd *cobra.Command, out io.Writer, options *Ap return err } - mapper, typer := f.Object(cmdutil.GetIncludeThirdPartyAPIs(cmd)) + mapper, typer := f.Object() r := resource.NewBuilder(mapper, typer, resource.ClientMapperFunc(f.ClientForMapping), f.Decoder(true)). Schema(schema). ContinueOnError(). diff --git a/pkg/kubectl/cmd/autoscale.go b/pkg/kubectl/cmd/autoscale.go index db8cea36092..3846af8962c 100644 --- a/pkg/kubectl/cmd/autoscale.go +++ b/pkg/kubectl/cmd/autoscale.go @@ -98,7 +98,7 @@ func RunAutoscale(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args [] return err } - mapper, typer := f.Object(cmdutil.GetIncludeThirdPartyAPIs(cmd)) + mapper, typer := f.Object() r := resource.NewBuilder(mapper, typer, resource.ClientMapperFunc(f.ClientForMapping), f.Decoder(true)). ContinueOnError(). NamespaceParam(namespace).DefaultNamespace(). diff --git a/pkg/kubectl/cmd/clusterinfo.go b/pkg/kubectl/cmd/clusterinfo.go index cbb57d2e13a..87b76e6f8ff 100644 --- a/pkg/kubectl/cmd/clusterinfo.go +++ b/pkg/kubectl/cmd/clusterinfo.go @@ -61,7 +61,7 @@ func RunClusterInfo(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command) error } printService(out, "Kubernetes master", client.Host) - mapper, typer := f.Object(cmdutil.GetIncludeThirdPartyAPIs(cmd)) + mapper, typer := f.Object() cmdNamespace := cmdutil.GetFlagString(cmd, "namespace") if cmdNamespace == "" { cmdNamespace = api.NamespaceSystem diff --git a/pkg/kubectl/cmd/cmd_test.go b/pkg/kubectl/cmd/cmd_test.go index 552d5578087..9aee95ce493 100644 --- a/pkg/kubectl/cmd/cmd_test.go +++ b/pkg/kubectl/cmd/cmd_test.go @@ -220,7 +220,7 @@ func NewTestFactory() (*cmdutil.Factory, *testFactory, runtime.Codec, runtime.Ne runtime.SerializerInfo{Serializer: codec}, runtime.StreamSerializerInfo{}) return &cmdutil.Factory{ - Object: func(discovery bool) (meta.RESTMapper, runtime.ObjectTyper) { + Object: func() (meta.RESTMapper, runtime.ObjectTyper) { priorityRESTMapper := meta.PriorityRESTMapper{ Delegate: t.Mapper, ResourcePriority: []unversioned.GroupVersionResource{ @@ -264,7 +264,7 @@ func NewMixedFactory(apiClient resource.RESTClient) (*cmdutil.Factory, *testFact var multiRESTMapper meta.MultiRESTMapper multiRESTMapper = append(multiRESTMapper, t.Mapper) multiRESTMapper = append(multiRESTMapper, testapi.Default.RESTMapper()) - f.Object = func(discovery bool) (meta.RESTMapper, runtime.ObjectTyper) { + f.Object = func() (meta.RESTMapper, runtime.ObjectTyper) { priorityRESTMapper := meta.PriorityRESTMapper{ Delegate: multiRESTMapper, ResourcePriority: []unversioned.GroupVersionResource{ @@ -291,7 +291,7 @@ func NewAPIFactory() (*cmdutil.Factory, *testFactory, runtime.Codec, runtime.Neg } f := &cmdutil.Factory{ - Object: func(discovery bool) (meta.RESTMapper, runtime.ObjectTyper) { + Object: func() (meta.RESTMapper, runtime.ObjectTyper) { return testapi.Default.RESTMapper(), api.Scheme }, UnstructuredObject: func() (meta.RESTMapper, runtime.ObjectTyper, error) { @@ -450,7 +450,7 @@ func Example_printReplicationControllerWithNamespace() { ReadyReplicas: 1, }, } - mapper, _ := f.Object(false) + mapper, _ := f.Object() err := f.PrintObject(cmd, mapper, ctrl, os.Stdout) if err != nil { fmt.Printf("Unexpected error: %v", err) @@ -502,7 +502,7 @@ func Example_printMultiContainersReplicationControllerWithWide() { Replicas: 1, }, } - mapper, _ := f.Object(false) + mapper, _ := f.Object() err := f.PrintObject(cmd, mapper, ctrl, os.Stdout) if err != nil { fmt.Printf("Unexpected error: %v", err) @@ -553,7 +553,7 @@ func Example_printReplicationController() { Replicas: 1, }, } - mapper, _ := f.Object(false) + mapper, _ := f.Object() err := f.PrintObject(cmd, mapper, ctrl, os.Stdout) if err != nil { fmt.Printf("Unexpected error: %v", err) @@ -593,7 +593,7 @@ func Example_printPodWithWideFormat() { PodIP: "10.1.1.3", }, } - mapper, _ := f.Object(false) + mapper, _ := f.Object() err := f.PrintObject(cmd, mapper, pod, os.Stdout) if err != nil { fmt.Printf("Unexpected error: %v", err) @@ -636,7 +636,7 @@ func Example_printPodWithShowLabels() { }, }, } - mapper, _ := f.Object(false) + mapper, _ := f.Object() err := f.PrintObject(cmd, mapper, pod, os.Stdout) if err != nil { fmt.Printf("Unexpected error: %v", err) @@ -749,7 +749,7 @@ func Example_printPodHideTerminated() { } cmd := NewCmdRun(f, os.Stdin, os.Stdout, os.Stderr) podList := newAllPhasePodList() - mapper, _ := f.Object(false) + mapper, _ := f.Object() err := f.PrintObject(cmd, mapper, podList, os.Stdout) if err != nil { fmt.Printf("Unexpected error: %v", err) @@ -773,7 +773,7 @@ func Example_printPodShowAll() { } cmd := NewCmdRun(f, os.Stdin, os.Stdout, os.Stderr) podList := newAllPhasePodList() - mapper, _ := f.Object(false) + mapper, _ := f.Object() err := f.PrintObject(cmd, mapper, podList, os.Stdout) if err != nil { fmt.Printf("Unexpected error: %v", err) @@ -846,7 +846,7 @@ func Example_printServiceWithNamespacesAndLabels() { ld := strings.NewLineDelimiter(os.Stdout, "|") defer ld.Flush() - mapper, _ := f.Object(false) + mapper, _ := f.Object() err := f.PrintObject(cmd, mapper, svc, ld) if err != nil { fmt.Printf("Unexpected error: %v", err) diff --git a/pkg/kubectl/cmd/convert.go b/pkg/kubectl/cmd/convert.go index bad2e5565e7..9a666dc12cf 100644 --- a/pkg/kubectl/cmd/convert.go +++ b/pkg/kubectl/cmd/convert.go @@ -115,7 +115,7 @@ func (o *ConvertOptions) Complete(f *cmdutil.Factory, out io.Writer, cmd *cobra. } // build the builder - mapper, typer := f.Object(cmdutil.GetIncludeThirdPartyAPIs(cmd)) + mapper, typer := f.Object() clientMapper := resource.ClientMapperFunc(f.ClientForMapping) if o.local { diff --git a/pkg/kubectl/cmd/create.go b/pkg/kubectl/cmd/create.go index 891a6409e50..b86489c4d57 100644 --- a/pkg/kubectl/cmd/create.go +++ b/pkg/kubectl/cmd/create.go @@ -200,7 +200,7 @@ func RunCreateSubcommand(f *cmdutil.Factory, cmd *cobra.Command, out io.Writer, if err != nil { return err } - mapper, typer := f.Object(cmdutil.GetIncludeThirdPartyAPIs(cmd)) + mapper, typer := f.Object() gvks, _, err := typer.ObjectKinds(obj) if err != nil { return err diff --git a/pkg/kubectl/cmd/delete.go b/pkg/kubectl/cmd/delete.go index fdad53bf452..7447426b1b5 100644 --- a/pkg/kubectl/cmd/delete.go +++ b/pkg/kubectl/cmd/delete.go @@ -122,7 +122,7 @@ func RunDelete(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []str return err } deleteAll := cmdutil.GetFlagBool(cmd, "all") - mapper, typer := f.Object(cmdutil.GetIncludeThirdPartyAPIs(cmd)) + mapper, typer := f.Object() r := resource.NewBuilder(mapper, typer, resource.ClientMapperFunc(f.ClientForMapping), f.Decoder(true)). ContinueOnError(). NamespaceParam(cmdNamespace).DefaultNamespace(). diff --git a/pkg/kubectl/cmd/describe.go b/pkg/kubectl/cmd/describe.go index f6b33833b7e..26d444038ca 100644 --- a/pkg/kubectl/cmd/describe.go +++ b/pkg/kubectl/cmd/describe.go @@ -118,7 +118,7 @@ func RunDescribe(f *cmdutil.Factory, out, cmdErr io.Writer, cmd *cobra.Command, return cmdutil.UsageError(cmd, "Required resource not specified.") } - mapper, typer := f.Object(cmdutil.GetIncludeThirdPartyAPIs(cmd)) + mapper, typer := f.Object() r := resource.NewBuilder(mapper, typer, resource.ClientMapperFunc(f.ClientForMapping), f.Decoder(true)). ContinueOnError(). NamespaceParam(cmdNamespace).DefaultNamespace().AllNamespaces(allNamespaces). diff --git a/pkg/kubectl/cmd/drain.go b/pkg/kubectl/cmd/drain.go index f21ac9c649b..4b3e362f89c 100644 --- a/pkg/kubectl/cmd/drain.go +++ b/pkg/kubectl/cmd/drain.go @@ -188,14 +188,14 @@ func (o *DrainOptions) SetupDrain(cmd *cobra.Command, args []string) error { return err } - o.mapper, o.typer = o.factory.Object(false) + o.mapper, o.typer = o.factory.Object() cmdNamespace, _, err := o.factory.DefaultNamespace() if err != nil { return err } - r := o.factory.NewBuilder(cmdutil.GetIncludeThirdPartyAPIs(cmd)). + r := o.factory.NewBuilder(). NamespaceParam(cmdNamespace).DefaultNamespace(). ResourceNames("node", args[0]). Do() diff --git a/pkg/kubectl/cmd/edit.go b/pkg/kubectl/cmd/edit.go index 54a725c35b5..5e72cab18a7 100644 --- a/pkg/kubectl/cmd/edit.go +++ b/pkg/kubectl/cmd/edit.go @@ -151,7 +151,7 @@ func RunEdit(f *cmdutil.Factory, out, errOut io.Writer, cmd *cobra.Command, args return err } - mapper, typer := f.Object(cmdutil.GetIncludeThirdPartyAPIs(cmd)) + mapper, typer := f.Object() resourceMapper := &resource.Mapper{ ObjectTyper: typer, RESTMapper: mapper, diff --git a/pkg/kubectl/cmd/explain.go b/pkg/kubectl/cmd/explain.go index 36ab144d12e..d296e808d89 100644 --- a/pkg/kubectl/cmd/explain.go +++ b/pkg/kubectl/cmd/explain.go @@ -74,7 +74,7 @@ func RunExplain(f *cmdutil.Factory, out, cmdErr io.Writer, cmd *cobra.Command, a apiVersionString := cmdutil.GetFlagString(cmd, "api-version") apiVersion := unversioned.GroupVersion{} - mapper, _ := f.Object(cmdutil.GetIncludeThirdPartyAPIs(cmd)) + mapper, _ := f.Object() // TODO: After we figured out the new syntax to separate group and resource, allow // the users to use it in explain (kubectl explain ). // Refer to issue #16039 for why we do this. Refer to PR #15808 that used "/" syntax. diff --git a/pkg/kubectl/cmd/expose.go b/pkg/kubectl/cmd/expose.go index 2ae63f9e90a..c5eb5fd6d78 100644 --- a/pkg/kubectl/cmd/expose.go +++ b/pkg/kubectl/cmd/expose.go @@ -137,7 +137,7 @@ func RunExpose(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []str return err } - mapper, typer := f.Object(false) + mapper, typer := f.Object() r := resource.NewBuilder(mapper, typer, resource.ClientMapperFunc(f.ClientForMapping), f.Decoder(true)). ContinueOnError(). NamespaceParam(namespace).DefaultNamespace(). diff --git a/pkg/kubectl/cmd/get.go b/pkg/kubectl/cmd/get.go index 18434ea0fd6..163d506c906 100644 --- a/pkg/kubectl/cmd/get.go +++ b/pkg/kubectl/cmd/get.go @@ -156,7 +156,7 @@ func RunGet(f *cmdutil.Factory, out io.Writer, errOut io.Writer, cmd *cobra.Comm selector := cmdutil.GetFlagString(cmd, "selector") allNamespaces := cmdutil.GetFlagBool(cmd, "all-namespaces") showKind := cmdutil.GetFlagBool(cmd, "show-kind") - mapper, typer := f.Object(cmdutil.GetIncludeThirdPartyAPIs(cmd)) + mapper, typer := f.Object() printAll := false cmdNamespace, enforceNamespace, err := f.DefaultNamespace() diff --git a/pkg/kubectl/cmd/label.go b/pkg/kubectl/cmd/label.go index 763b2cc4111..d310a4a0469 100644 --- a/pkg/kubectl/cmd/label.go +++ b/pkg/kubectl/cmd/label.go @@ -206,7 +206,7 @@ func RunLabel(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []stri if err != nil { return cmdutil.UsageError(cmd, err.Error()) } - mapper, typer := f.Object(cmdutil.GetIncludeThirdPartyAPIs(cmd)) + mapper, typer := f.Object() b := resource.NewBuilder(mapper, typer, resource.ClientMapperFunc(f.ClientForMapping), f.Decoder(true)). ContinueOnError(). NamespaceParam(cmdNamespace).DefaultNamespace(). diff --git a/pkg/kubectl/cmd/logs.go b/pkg/kubectl/cmd/logs.go index 413e7083ef3..5f75160f9d3 100644 --- a/pkg/kubectl/cmd/logs.go +++ b/pkg/kubectl/cmd/logs.go @@ -162,7 +162,7 @@ func (o *LogsOptions) Complete(f *cmdutil.Factory, out io.Writer, cmd *cobra.Com o.ClientMapper = resource.ClientMapperFunc(f.ClientForMapping) o.Out = out - mapper, typer := f.Object(cmdutil.GetIncludeThirdPartyAPIs(cmd)) + mapper, typer := f.Object() decoder := f.Decoder(true) if o.Object == nil { infos, err := resource.NewBuilder(mapper, typer, o.ClientMapper, decoder). diff --git a/pkg/kubectl/cmd/patch.go b/pkg/kubectl/cmd/patch.go index 0e830908bc5..c4f617b1c92 100644 --- a/pkg/kubectl/cmd/patch.go +++ b/pkg/kubectl/cmd/patch.go @@ -142,7 +142,7 @@ func RunPatch(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []stri return fmt.Errorf("unable to parse %q: %v", patch, err) } - mapper, typer := f.Object(cmdutil.GetIncludeThirdPartyAPIs(cmd)) + mapper, typer := f.Object() r := resource.NewBuilder(mapper, typer, resource.ClientMapperFunc(f.ClientForMapping), f.Decoder(true)). ContinueOnError(). NamespaceParam(cmdNamespace).DefaultNamespace(). diff --git a/pkg/kubectl/cmd/replace.go b/pkg/kubectl/cmd/replace.go index f1bd13e4f12..04f30ca9814 100644 --- a/pkg/kubectl/cmd/replace.go +++ b/pkg/kubectl/cmd/replace.go @@ -130,7 +130,7 @@ func RunReplace(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []st return fmt.Errorf("--timeout must have --force specified") } - mapper, typer := f.Object(cmdutil.GetIncludeThirdPartyAPIs(cmd)) + mapper, typer := f.Object() r := resource.NewBuilder(mapper, typer, resource.ClientMapperFunc(f.ClientForMapping), f.Decoder(true)). Schema(schema). ContinueOnError(). diff --git a/pkg/kubectl/cmd/rollingupdate.go b/pkg/kubectl/cmd/rollingupdate.go index bd4d618d65d..9e11c799f83 100644 --- a/pkg/kubectl/cmd/rollingupdate.go +++ b/pkg/kubectl/cmd/rollingupdate.go @@ -202,7 +202,7 @@ func RunRollingUpdate(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, arg var keepOldName bool var replicasDefaulted bool - mapper, typer := f.Object(cmdutil.GetIncludeThirdPartyAPIs(cmd)) + mapper, typer := f.Object() if len(filename) != 0 { schema, err := f.Validator(cmdutil.GetFlagBool(cmd, "validate"), cmdutil.GetFlagString(cmd, "schema-cache-dir")) diff --git a/pkg/kubectl/cmd/rollout/rollout_history.go b/pkg/kubectl/cmd/rollout/rollout_history.go index ad51038a76a..79444259676 100644 --- a/pkg/kubectl/cmd/rollout/rollout_history.go +++ b/pkg/kubectl/cmd/rollout/rollout_history.go @@ -77,7 +77,7 @@ func RunHistory(f *cmdutil.Factory, cmd *cobra.Command, out io.Writer, args []st } revision := cmdutil.GetFlagInt64(cmd, "revision") - mapper, typer := f.Object(false) + mapper, typer := f.Object() cmdNamespace, enforceNamespace, err := f.DefaultNamespace() if err != nil { diff --git a/pkg/kubectl/cmd/rollout/rollout_pause.go b/pkg/kubectl/cmd/rollout/rollout_pause.go index 9d7bbbc6c28..faa80f48b2a 100644 --- a/pkg/kubectl/cmd/rollout/rollout_pause.go +++ b/pkg/kubectl/cmd/rollout/rollout_pause.go @@ -96,7 +96,7 @@ func (o *PauseConfig) CompletePause(f *cmdutil.Factory, cmd *cobra.Command, out return cmdutil.UsageError(cmd, cmd.Use) } - o.Mapper, o.Typer = f.Object(false) + o.Mapper, o.Typer = f.Object() o.PauseObject = f.PauseObject o.Out = out diff --git a/pkg/kubectl/cmd/rollout/rollout_resume.go b/pkg/kubectl/cmd/rollout/rollout_resume.go index 4e9c21a69d0..e277392ca47 100644 --- a/pkg/kubectl/cmd/rollout/rollout_resume.go +++ b/pkg/kubectl/cmd/rollout/rollout_resume.go @@ -94,7 +94,7 @@ func (o *ResumeConfig) CompleteResume(f *cmdutil.Factory, cmd *cobra.Command, ou return cmdutil.UsageError(cmd, cmd.Use) } - o.Mapper, o.Typer = f.Object(false) + o.Mapper, o.Typer = f.Object() o.ResumeObject = f.ResumeObject o.Out = out diff --git a/pkg/kubectl/cmd/rollout/rollout_status.go b/pkg/kubectl/cmd/rollout/rollout_status.go index 5395b6d5c25..ce916430c97 100644 --- a/pkg/kubectl/cmd/rollout/rollout_status.go +++ b/pkg/kubectl/cmd/rollout/rollout_status.go @@ -73,7 +73,7 @@ func RunStatus(f *cmdutil.Factory, cmd *cobra.Command, out io.Writer, args []str return cmdutil.UsageError(cmd, "Required resource not specified.") } - mapper, typer := f.Object(false) + mapper, typer := f.Object() cmdNamespace, enforceNamespace, err := f.DefaultNamespace() if err != nil { diff --git a/pkg/kubectl/cmd/rollout/rollout_undo.go b/pkg/kubectl/cmd/rollout/rollout_undo.go index eb6960631f6..badbbd21f6b 100644 --- a/pkg/kubectl/cmd/rollout/rollout_undo.go +++ b/pkg/kubectl/cmd/rollout/rollout_undo.go @@ -100,7 +100,7 @@ func (o *UndoOptions) CompleteUndo(f *cmdutil.Factory, cmd *cobra.Command, out i } o.ToRevision = cmdutil.GetFlagInt64(cmd, "to-revision") - o.Mapper, o.Typer = f.Object(false) + o.Mapper, o.Typer = f.Object() o.Out = out o.DryRun = cmdutil.GetFlagBool(cmd, "dry-run") diff --git a/pkg/kubectl/cmd/run.go b/pkg/kubectl/cmd/run.go index 87751e3fc8e..83ebc8f76a9 100644 --- a/pkg/kubectl/cmd/run.go +++ b/pkg/kubectl/cmd/run.go @@ -305,7 +305,7 @@ func Run(f *cmdutil.Factory, cmdIn io.Reader, cmdOut, cmdErr io.Writer, cmd *cob if err != nil { return err } - _, typer := f.Object(cmdutil.GetIncludeThirdPartyAPIs(cmd)) + _, typer := f.Object() r := resource.NewBuilder(mapper, typer, resource.ClientMapperFunc(f.ClientForMapping), f.Decoder(true)). ContinueOnError(). NamespaceParam(namespace).DefaultNamespace(). @@ -592,7 +592,7 @@ func createGeneratedObject(f *cmdutil.Factory, cmd *cobra.Command, generator kub return nil, "", nil, nil, err } - mapper, typer := f.Object(cmdutil.GetIncludeThirdPartyAPIs(cmd)) + mapper, typer := f.Object() groupVersionKinds, _, err := typer.ObjectKinds(obj) if err != nil { return nil, "", nil, nil, err diff --git a/pkg/kubectl/cmd/scale.go b/pkg/kubectl/cmd/scale.go index 1475ba81453..65e085951e3 100644 --- a/pkg/kubectl/cmd/scale.go +++ b/pkg/kubectl/cmd/scale.go @@ -111,7 +111,7 @@ func RunScale(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []stri return err } - mapper, typer := f.Object(cmdutil.GetIncludeThirdPartyAPIs(cmd)) + mapper, typer := f.Object() r := resource.NewBuilder(mapper, typer, resource.ClientMapperFunc(f.ClientForMapping), f.Decoder(true)). ContinueOnError(). NamespaceParam(cmdNamespace).DefaultNamespace(). diff --git a/pkg/kubectl/cmd/set/set_image.go b/pkg/kubectl/cmd/set/set_image.go index 4444e6c550a..47cd171779d 100644 --- a/pkg/kubectl/cmd/set/set_image.go +++ b/pkg/kubectl/cmd/set/set_image.go @@ -108,7 +108,7 @@ func NewCmdImage(f *cmdutil.Factory, out io.Writer) *cobra.Command { } func (o *ImageOptions) Complete(f *cmdutil.Factory, cmd *cobra.Command, args []string) error { - o.Mapper, o.Typer = f.Object(cmdutil.GetIncludeThirdPartyAPIs(cmd)) + o.Mapper, o.Typer = f.Object() o.UpdatePodSpecForObject = f.UpdatePodSpecForObject o.Encoder = f.JSONEncoder() o.ShortOutput = cmdutil.GetFlagString(cmd, "output") == "name" diff --git a/pkg/kubectl/cmd/stop.go b/pkg/kubectl/cmd/stop.go index ac7132b2e29..95c6880d66e 100644 --- a/pkg/kubectl/cmd/stop.go +++ b/pkg/kubectl/cmd/stop.go @@ -90,7 +90,7 @@ func RunStop(f *cmdutil.Factory, cmd *cobra.Command, args []string, out io.Write return err } - mapper, typer := f.Object(cmdutil.GetIncludeThirdPartyAPIs(cmd)) + mapper, typer := f.Object() r := resource.NewBuilder(mapper, typer, resource.ClientMapperFunc(f.ClientForMapping), f.Decoder(true)). ContinueOnError(). NamespaceParam(cmdNamespace).DefaultNamespace(). diff --git a/pkg/kubectl/cmd/taint.go b/pkg/kubectl/cmd/taint.go index 25b7dcb8d9e..66aa6216f91 100644 --- a/pkg/kubectl/cmd/taint.go +++ b/pkg/kubectl/cmd/taint.go @@ -256,7 +256,7 @@ func (o *TaintOptions) Complete(f *cmdutil.Factory, out io.Writer, cmd *cobra.Co return cmdutil.UsageError(cmd, err.Error()) } - mapper, typer := f.Object(cmdutil.GetIncludeThirdPartyAPIs(cmd)) + mapper, typer := f.Object() o.builder = resource.NewBuilder(mapper, typer, resource.ClientMapperFunc(f.ClientForMapping), f.Decoder(true)). ContinueOnError(). NamespaceParam(namespace).DefaultNamespace() @@ -365,7 +365,7 @@ func (o TaintOptions) RunTaint() error { return err } - mapper, _ := o.f.Object(cmdutil.GetIncludeThirdPartyAPIs(o.cmd)) + mapper, _ := o.f.Object() outputFormat := cmdutil.GetFlagString(o.cmd, "output") if outputFormat != "" { return o.f.PrintObject(o.cmd, mapper, outputObj, o.out) diff --git a/pkg/kubectl/cmd/util/factory.go b/pkg/kubectl/cmd/util/factory.go index 13f18aeaafe..eeaa304d0af 100644 --- a/pkg/kubectl/cmd/util/factory.go +++ b/pkg/kubectl/cmd/util/factory.go @@ -82,9 +82,8 @@ type Factory struct { clients *ClientCache flags *pflag.FlagSet - // Returns interfaces for dealing with arbitrary runtime.Objects. If thirdPartyDiscovery is true, performs API calls - // to discovery dynamic API objects registered by third parties. - Object func(thirdPartyDiscovery bool) (meta.RESTMapper, runtime.ObjectTyper) + // Returns interfaces for dealing with arbitrary runtime.Objects. + Object func() (meta.RESTMapper, runtime.ObjectTyper) // Returns interfaces for dealing with arbitrary // runtime.Unstructured. This performs API calls to discover types. UnstructuredObject func() (meta.RESTMapper, runtime.ObjectTyper, error) @@ -293,7 +292,7 @@ func NewFactory(optionalClientConfig clientcmd.ClientConfig) *Factory { clients: clients, flags: flags, - Object: func(discoverDynamicAPIs bool) (meta.RESTMapper, runtime.ObjectTyper) { + Object: func() (meta.RESTMapper, runtime.ObjectTyper) { cfg, err := clientConfig.ClientConfig() checkErrWithPrefix("failed to get client config: ", err) cmdApiVersion := unversioned.GroupVersion{} @@ -1251,8 +1250,8 @@ func (f *Factory) PrinterForMapping(cmd *cobra.Command, mapping *meta.RESTMappin } // One stop shopping for a Builder -func (f *Factory) NewBuilder(thirdPartyDiscovery bool) *resource.Builder { - mapper, typer := f.Object(thirdPartyDiscovery) +func (f *Factory) NewBuilder() *resource.Builder { + mapper, typer := f.Object() return resource.NewBuilder(mapper, typer, resource.ClientMapperFunc(f.ClientForMapping), f.Decoder(true)) } diff --git a/pkg/kubectl/cmd/util/helpers.go b/pkg/kubectl/cmd/util/helpers.go index 0b47a5a2dd9..420dcdf62ea 100644 --- a/pkg/kubectl/cmd/util/helpers.go +++ b/pkg/kubectl/cmd/util/helpers.go @@ -554,15 +554,9 @@ func GetThirdPartyGroupVersions(discovery discovery.DiscoveryInterface) ([]unver return result, gvks, nil } -func GetIncludeThirdPartyAPIs(cmd *cobra.Command) bool { - if cmd.Flags().Lookup("include-extended-apis") == nil { - return false - } - return GetFlagBool(cmd, "include-extended-apis") -} - func AddInclude3rdPartyFlags(cmd *cobra.Command) { cmd.Flags().Bool("include-extended-apis", true, "If true, include definitions of new APIs via calls to the API server. [default true]") + cmd.Flags().MarkDeprecated("include-extended-apis", "No longer required.") } // GetResourcesAndPairs retrieves resources and "KEY=VALUE or KEY-" pair args from given args