make --include-extended-apis deprecated and remove plumbing

This commit is contained in:
deads2k
2016-09-16 15:50:34 -04:00
parent 9bc7e36f4b
commit 862415aaa2
31 changed files with 49 additions and 56 deletions

View File

@@ -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)