add Local and Unstructured builder attributes

juanvallejo · juanvallejo · commit 4ad399ed9538 · 2017-10-26T17:12:58.000-04:00
diff --git a/pkg/oc/admin/migrate/migrator.go b/pkg/oc/admin/migrate/migrator.go
@@ -212,7 +212,7 @@ func (o *ResourceOptions) Complete(f *clientcmd.Factory, c *cobra.Command) error
 		break
 	}
 
-	o.Builder = f.NewBuilder(true).
+	o.Builder = f.NewBuilder().
 		AllNamespaces(allNamespaces).
 		FilenameParam(false, &resource.FilenameOptions{Recursive: false, Filenames: o.Filenames}).
 		ContinueOnError().
diff --git a/pkg/oc/admin/network/project_options.go b/pkg/oc/admin/network/project_options.go
@@ -58,7 +58,7 @@ func (p *ProjectOptions) Complete(f *clientcmd.Factory, c *cobra.Command, args [
 		return err
 	}
 
-	p.Builder = f.NewBuilder(true)
+	p.Builder = f.NewBuilder()
 	p.DefaultNamespace = defaultNamespace
 	p.Oclient = networkClient
 	p.Kclient = kc
diff --git a/pkg/oc/admin/node/node_options.go b/pkg/oc/admin/node/node_options.go
@@ -75,7 +75,7 @@ func (n *NodeOptions) Complete(f *clientcmd.Factory, c *cobra.Command, args []st
 	}
 	mapper, typer := f.Object()
 
-	n.Builder = f.NewBuilder(true)
+	n.Builder = f.NewBuilder()
 	n.DefaultNamespace = defaultNamespace
 	n.ExternalKubeClient = externalkc
 	n.KubeClient = kc
diff --git a/pkg/oc/admin/policy/review.go b/pkg/oc/admin/policy/review.go
@@ -107,7 +107,7 @@ func (o *sccReviewOptions) Complete(f *clientcmd.Factory, args []string, cmd *co
 		return fmt.Errorf("unable to obtain client: %v", err)
 	}
 	o.client = securityClient.Security()
-	o.builder = f.NewBuilder(true)
+	o.builder = f.NewBuilder()
 	o.RESTClientFactory = f.ClientForMapping
 
 	output := kcmdutil.GetFlagString(cmd, "output")
diff --git a/pkg/oc/admin/policy/subject_review.go b/pkg/oc/admin/policy/subject_review.go
@@ -108,7 +108,7 @@ func (o *sccSubjectReviewOptions) Complete(f *clientcmd.Factory, args []string,
 	}
 	o.sccSubjectReviewClient = securityClient.Security()
 	o.sccSelfSubjectReviewClient = securityClient.Security()
-	o.builder = f.NewBuilder(true)
+	o.builder = f.NewBuilder()
 	o.RESTClientFactory = f.ClientForMapping
 
 	output := kcmdutil.GetFlagString(cmd, "output")
diff --git a/pkg/oc/bootstrap/docker/openshift/import.go b/pkg/oc/bootstrap/docker/openshift/import.go
@@ -24,7 +24,7 @@ func ImportObjects(f *clientcmd.Factory, ns, location string) error {
 		return err
 	}
 	glog.V(8).Infof("Importing data:\n%s\n", string(data))
-	r := f.NewBuilder(true).
+	r := f.NewBuilder().
 		Schema(schema).
 		ContinueOnError().
 		NamespaceParam(ns).
diff --git a/pkg/oc/cli/cmd/debug.go b/pkg/oc/cli/cmd/debug.go
@@ -221,7 +221,7 @@ func (o *DebugOptions) Complete(cmd *cobra.Command, f *clientcmd.Factory, args [
 	}
 
 	mapper, _ := f.Object()
-	b := f.NewBuilder(true).
+	b := f.NewBuilder().
 		NamespaceParam(cmdNamespace).DefaultNamespace().
 		SingleResourceType().
 		ResourceNames("pods", resources...).
diff --git a/pkg/oc/cli/cmd/deploy.go b/pkg/oc/cli/cmd/deploy.go
@@ -155,7 +155,7 @@ func (o *DeployOptions) Complete(f *clientcmd.Factory, args []string, out io.Wri
 		return err
 	}
 
-	o.builder = f.NewBuilder(true)
+	o.builder = f.NewBuilder()
 	o.out = out
 
 	if len(args) > 0 {
diff --git a/pkg/oc/cli/cmd/export.go b/pkg/oc/cli/cmd/export.go
@@ -110,17 +110,13 @@ func RunExport(f *clientcmd.Factory, exporter Exporter, in io.Reader, out io.Wri
 		return err
 	}
 
-	builder, err := f.NewUnstructuredBuilder(true)
-	if err != nil {
-		return err
-	}
-
 	mapper, typer, err := f.UnstructuredObject()
 	if err != nil {
 		return err
 	}
 
-	b := builder.
+	b := f.NewBuilder().
+		Unstructured(f.UnstructuredClientForMapping, mapper, typer).
 		NamespaceParam(cmdNamespace).DefaultNamespace().AllNamespaces(allNamespaces).
 		FilenameParam(explicit, &resource.FilenameOptions{Recursive: false, Filenames: filenames}).
 		SelectorParam(selector).
diff --git a/pkg/oc/cli/cmd/expose.go b/pkg/oc/cli/cmd/expose.go
@@ -93,7 +93,7 @@ func validate(cmd *cobra.Command, f *clientcmd.Factory, args []string) error {
 		return err
 	}
 
-	r := f.NewBuilder(true).
+	r := f.NewBuilder().
 		ContinueOnError().
 		NamespaceParam(namespace).DefaultNamespace().
 		FilenameParam(enforceNamespace, &resource.FilenameOptions{Recursive: false, Filenames: kcmdutil.GetFlagStringSlice(cmd, "filename")}).
diff --git a/pkg/oc/cli/cmd/extract.go b/pkg/oc/cli/cmd/extract.go
@@ -98,7 +98,7 @@ func (o *ExtractOptions) Complete(f *clientcmd.Factory, in io.Reader, out io.Wri
 		return err
 	}
 
-	b := f.NewBuilder(true).
+	b := f.NewBuilder().
 		NamespaceParam(cmdNamespace).DefaultNamespace().
 		FilenameParam(explicit, &resource.FilenameOptions{Recursive: false, Filenames: o.Filenames}).
 		ResourceNames("", args...).
diff --git a/pkg/oc/cli/cmd/idle.go b/pkg/oc/cli/cmd/idle.go
@@ -114,7 +114,7 @@ func (o *IdleOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, args []
 		return fmt.Errorf("resource names, selectors, and the all flag may not be be specified if a filename is specified")
 	}
 
-	o.svcBuilder = f.NewBuilder(true).
+	o.svcBuilder = f.NewBuilder().
 		ContinueOnError().
 		NamespaceParam(namespace).DefaultNamespace().AllNamespaces(o.allNamespaces).
 		Flatten().
diff --git a/pkg/oc/cli/cmd/logs.go b/pkg/oc/cli/cmd/logs.go
@@ -126,7 +126,7 @@ func (o *OpenShiftLogsOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command
 
 	podLogOptions := o.KubeLogOptions.Options.(*kapi.PodLogOptions)
 
-	infos, err := f.NewBuilder(true).
+	infos, err := f.NewBuilder().
 		NamespaceParam(o.Namespace).DefaultNamespace().
 		ResourceNames("pods", args...).
 		SingleResourceType().RequireObject(false).
diff --git a/pkg/oc/cli/cmd/process.go b/pkg/oc/cli/cmd/process.go
@@ -221,8 +221,14 @@ func RunProcess(f *clientcmd.Factory, in io.Reader, out, errout io.Writer, cmd *
 		templateObj.CreationTimestamp = metav1.Now()
 		infos = append(infos, &resource.Info{Object: templateObj})
 	} else {
-		infos, err = f.NewBuilder(!local).
-			FilenameParam(explicit, &resource.FilenameOptions{Recursive: false, Filenames: []string{filename}}).
+		b := f.NewBuilder().
+			FilenameParam(explicit, &resource.FilenameOptions{Recursive: false, Filenames: []string{filename}})
+
+		if local {
+			b = b.Local(f.ClientForMapping)
+		}
+
+		infos, err = b.
 			Do().
 			Infos()
 		if err != nil {
diff --git a/pkg/oc/cli/cmd/rollback.go b/pkg/oc/cli/cmd/rollback.go
@@ -135,7 +135,7 @@ func (o *RollbackOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, arg
 
 	// Set up client based support.
 	o.getBuilder = func() *resource.Builder {
-		return f.NewBuilder(true)
+		return f.NewBuilder()
 	}
 
 	kClient, err := f.ClientSet()
diff --git a/pkg/oc/cli/cmd/rollout/cancel.go b/pkg/oc/cli/cmd/rollout/cancel.go
@@ -89,7 +89,7 @@ func (o *CancelOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, out i
 		return err
 	}
 
-	r := f.NewBuilder(true).
+	r := f.NewBuilder().
 		NamespaceParam(cmdNamespace).DefaultNamespace().
 		FilenameParam(enforceNamespace, &o.FilenameOptions).
 		ResourceTypeOrNameArgs(true, args...).
diff --git a/pkg/oc/cli/cmd/rollout/latest.go b/pkg/oc/cli/cmd/rollout/latest.go
@@ -107,7 +107,7 @@ func (o *RolloutLatestOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command
 	o.appsClient = appsClient.Apps()
 
 	o.mapper, o.typer = f.Object()
-	o.infos, err = f.NewBuilder(true).
+	o.infos, err = f.NewBuilder().
 		ContinueOnError().
 		NamespaceParam(namespace).
 		ResourceNames("deploymentconfigs", args[0]).
diff --git a/pkg/oc/cli/cmd/rollout/retry.go b/pkg/oc/cli/cmd/rollout/retry.go
@@ -90,7 +90,7 @@ func (o *RetryOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, out io
 		return err
 	}
 
-	r := f.NewBuilder(true).
+	r := f.NewBuilder().
 		NamespaceParam(cmdNamespace).DefaultNamespace().
 		FilenameParam(enforceNamespace, &o.FilenameOptions).
 		ResourceTypeOrNameArgs(true, args...).
diff --git a/pkg/oc/cli/cmd/set/buildhook.go b/pkg/oc/cli/cmd/set/buildhook.go
@@ -137,7 +137,7 @@ func (o *BuildHookOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, ar
 	o.Cmd = cmd
 
 	mapper, _ := f.Object()
-	o.Builder = f.NewBuilder(!o.Local).
+	o.Builder = f.NewBuilder().
 		ContinueOnError().
 		NamespaceParam(cmdNamespace).DefaultNamespace().
 		FilenameParam(explicit, &resource.FilenameOptions{Recursive: false, Filenames: o.Filenames}).
@@ -159,6 +159,8 @@ func (o *BuildHookOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, ar
 		if len(resources) > 0 {
 			return resource.LocalResourceError
 		}
+
+		o.Builder = o.Builder.Local(f.ClientForMapping)
 	}
 
 	o.Output = kcmdutil.GetFlagString(cmd, "output")
diff --git a/pkg/oc/cli/cmd/set/buildsecret.go b/pkg/oc/cli/cmd/set/buildsecret.go
@@ -121,13 +121,17 @@ func NewCmdBuildSecret(fullName string, f *clientcmd.Factory, out, errOut io.Wri
 var supportedBuildTypes = []string{"buildconfigs"}
 
 func (o *BuildSecretOptions) secretFromArg(f *clientcmd.Factory, mapper meta.RESTMapper, typer runtime.ObjectTyper, namespace, arg string) (string, error) {
-	builder := f.NewBuilder(!o.Local).
+	builder := f.NewBuilder().
 		NamespaceParam(namespace).DefaultNamespace().
 		RequireObject(false).
 		ContinueOnError().
 		ResourceNames("secrets", arg).
 		Flatten()
 
+	if o.Local {
+		builder = o.Builder.Local(f.ClientForMapping)
+	}
+
 	var secretName string
 	err := builder.Do().Visit(func(info *resource.Info, err error) error {
 		if err != nil {
@@ -173,7 +177,7 @@ func (o *BuildSecretOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command,
 			return err
 		}
 	}
-	o.Builder = f.NewBuilder(!o.Local).
+	o.Builder = f.NewBuilder().
 		ContinueOnError().
 		NamespaceParam(cmdNamespace).DefaultNamespace().
 		FilenameParam(explicit, &resource.FilenameOptions{Recursive: false, Filenames: o.Filenames}).
@@ -195,6 +199,8 @@ func (o *BuildSecretOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command,
 		if len(resources) > 0 {
 			return resource.LocalResourceError
 		}
+
+		o.Builder = o.Builder.Local(f.ClientForMapping)
 	}
 
 	o.Output = kcmdutil.GetFlagString(cmd, "output")
diff --git a/pkg/oc/cli/cmd/set/deploymenthook.go b/pkg/oc/cli/cmd/set/deploymenthook.go
@@ -156,7 +156,7 @@ func (o *DeploymentHookOptions) Complete(f *clientcmd.Factory, cmd *cobra.Comman
 	o.Cmd = cmd
 
 	mapper, _ := f.Object()
-	o.Builder = f.NewBuilder(!o.Local).
+	o.Builder = f.NewBuilder().
 		ContinueOnError().
 		NamespaceParam(cmdNamespace).DefaultNamespace().
 		FilenameParam(explicit, &resource.FilenameOptions{Recursive: false, Filenames: o.Filenames}).
@@ -177,6 +177,8 @@ func (o *DeploymentHookOptions) Complete(f *clientcmd.Factory, cmd *cobra.Comman
 		if len(resources) > 0 {
 			return resource.LocalResourceError
 		}
+
+		o.Builder = o.Builder.Local(f.ClientForMapping)
 	}
 
 	o.Output = kcmdutil.GetFlagString(cmd, "output")
diff --git a/pkg/oc/cli/cmd/set/env.go b/pkg/oc/cli/cmd/set/env.go
@@ -225,7 +225,7 @@ func (o *EnvOptions) RunEnv(f *clientcmd.Factory) error {
 	}
 
 	if len(o.From) != 0 {
-		b := f.NewBuilder(!o.Local).
+		b := f.NewBuilder().
 			ContinueOnError().
 			NamespaceParam(cmdNamespace).DefaultNamespace().
 			FilenameParam(explicit, &resource.FilenameOptions{Recursive: false, Filenames: o.Filenames}).
@@ -235,6 +235,8 @@ func (o *EnvOptions) RunEnv(f *clientcmd.Factory) error {
 			b = b.
 				SelectorParam(o.Selector).
 				ResourceTypeOrNameArgs(o.All, o.From)
+		} else {
+			b = b.Local(f.ClientForMapping)
 		}
 
 		one := false
@@ -287,7 +289,7 @@ func (o *EnvOptions) RunEnv(f *clientcmd.Factory) error {
 		}
 	}
 
-	b := f.NewBuilder(!o.Local).
+	b := f.NewBuilder().
 		ContinueOnError().
 		NamespaceParam(cmdNamespace).DefaultNamespace().
 		FilenameParam(explicit, &resource.FilenameOptions{Recursive: false, Filenames: o.Filenames}).
@@ -304,6 +306,8 @@ func (o *EnvOptions) RunEnv(f *clientcmd.Factory) error {
 		if len(o.Resources) > 0 {
 			return resource.LocalResourceError
 		}
+
+		b = b.Local(f.ClientForMapping)
 	}
 
 	one := false
diff --git a/pkg/oc/cli/cmd/set/imagelookup.go b/pkg/oc/cli/cmd/set/imagelookup.go
@@ -164,7 +164,7 @@ func (o *ImageLookupOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command,
 	o.PrintTable = (len(args) == 0 && !o.All) || o.List
 
 	mapper, _ := f.Object()
-	o.Builder = f.NewBuilder(!o.Local).
+	o.Builder = f.NewBuilder().
 		ContinueOnError().
 		NamespaceParam(cmdNamespace).DefaultNamespace().
 		FilenameParam(explicit, &resource.FilenameOptions{Recursive: false, Filenames: o.Filenames}).
@@ -175,7 +175,7 @@ func (o *ImageLookupOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command,
 		return kcmdutil.UsageError(cmd, "Pass files with -f when using --local")
 	case o.Local:
 		// perform no lookups on the server
-		// TODO: discovery still requires a running server, doesn't fall back correctly
+		o.Builder = o.Builder.Local(f.ClientForMapping)
 	case len(args) == 0 && len(o.Filenames) == 0:
 		o.Builder = o.Builder.
 			SelectorParam(o.Selector).
diff --git a/pkg/oc/cli/cmd/set/probe.go b/pkg/oc/cli/cmd/set/probe.go
@@ -181,7 +181,7 @@ func (o *ProbeOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, args [
 	o.Cmd = cmd
 
 	mapper, _ := f.Object()
-	o.Builder = f.NewBuilder(!o.Local).
+	o.Builder = f.NewBuilder().
 		ContinueOnError().
 		NamespaceParam(cmdNamespace).DefaultNamespace().
 		FilenameParam(explicit, &resource.FilenameOptions{Recursive: false, Filenames: o.Filenames}).
@@ -198,6 +198,8 @@ func (o *ProbeOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, args [
 		if len(resources) > 0 {
 			return resource.LocalResourceError
 		}
+
+		o.Builder = o.Builder.Local(f.ClientForMapping)
 	}
 
 	o.Output = kcmdutil.GetFlagString(cmd, "output")
diff --git a/pkg/oc/cli/cmd/set/routebackends.go b/pkg/oc/cli/cmd/set/routebackends.go
@@ -161,7 +161,7 @@ func (o *BackendsOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, arg
 	o.Cmd = cmd
 
 	mapper, _ := f.Object()
-	o.Builder = f.NewBuilder(!o.Local).
+	o.Builder = f.NewBuilder().
 		ContinueOnError().
 		NamespaceParam(cmdNamespace).DefaultNamespace().
 		FilenameParam(explicit, &resource.FilenameOptions{Recursive: false, Filenames: o.Filenames}).
@@ -182,6 +182,8 @@ func (o *BackendsOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, arg
 		if len(resources) > 0 {
 			return resource.LocalResourceError
 		}
+
+		o.Builder = o.Builder.Local(f.ClientForMapping)
 	}
 
 	o.Output = kcmdutil.GetFlagString(cmd, "output")
diff --git a/pkg/oc/cli/cmd/set/triggers.go b/pkg/oc/cli/cmd/set/triggers.go
@@ -220,7 +220,7 @@ func (o *TriggersOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, arg
 	}
 
 	mapper, _ := f.Object()
-	o.Builder = f.NewBuilder(!o.Local).
+	o.Builder = f.NewBuilder().
 		ContinueOnError().
 		NamespaceParam(cmdNamespace).DefaultNamespace().
 		FilenameParam(explicit, &resource.FilenameOptions{Recursive: false, Filenames: o.Filenames}).
@@ -237,6 +237,8 @@ func (o *TriggersOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, arg
 		if len(args) > 0 {
 			return resource.LocalResourceError
 		}
+
+		o.Builder = o.Builder.Local(f.ClientForMapping)
 	}
 
 	o.Output = kcmdutil.GetFlagString(cmd, "output")
diff --git a/pkg/oc/cli/cmd/set/volume.go b/pkg/oc/cli/cmd/set/volume.go
@@ -427,7 +427,7 @@ func (v *VolumeOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, out,
 }
 
 func (v *VolumeOptions) RunVolume(args []string, f *clientcmd.Factory) error {
-	b := f.NewBuilder(!v.Local).
+	b := f.NewBuilder().
 		ContinueOnError().
 		NamespaceParam(v.DefaultNamespace).DefaultNamespace().
 		FilenameParam(v.ExplicitNamespace, &resource.FilenameOptions{Recursive: false, Filenames: v.Filenames}).
@@ -444,6 +444,8 @@ func (v *VolumeOptions) RunVolume(args []string, f *clientcmd.Factory) error {
 		if len(args) > 0 {
 			return resource.LocalResourceError
 		}
+
+		b = b.Local(f.ClientForMapping)
 	}
 
 	singleItemImplied := false
diff --git a/pkg/oc/cli/secrets/options.go b/pkg/oc/cli/secrets/options.go

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ func (o ResourceOptions) Complete(f clientcmd.Factory, c *cobra.Command) error`
`212`	`212`	`break`
`213`	`213`	`}`
`214`	`214`
`215`		`- o.Builder = f.NewBuilder(true).`
	`215`	`+ o.Builder = f.NewBuilder().`
`216`	`216`	`AllNamespaces(allNamespaces).`
`217`	`217`	`FilenameParam(false, &resource.FilenameOptions{Recursive: false, Filenames: o.Filenames}).`
`218`	`218`	`ContinueOnError().`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ func (p ProjectOptions) Complete(f clientcmd.Factory, c *cobra.Command, args [`
`58`	`58`	`return err`
`59`	`59`	`}`
`60`	`60`
`61`		`- p.Builder = f.NewBuilder(true)`
	`61`	`+ p.Builder = f.NewBuilder()`
`62`	`62`	`p.DefaultNamespace = defaultNamespace`
`63`	`63`	`p.Oclient = networkClient`
`64`	`64`	`p.Kclient = kc`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ func (n NodeOptions) Complete(f clientcmd.Factory, c *cobra.Command, args []st`
`75`	`75`	`}`
`76`	`76`	`mapper, typer := f.Object()`
`77`	`77`
`78`		`- n.Builder = f.NewBuilder(true)`
	`78`	`+ n.Builder = f.NewBuilder()`
`79`	`79`	`n.DefaultNamespace = defaultNamespace`
`80`	`80`	`n.ExternalKubeClient = externalkc`
`81`	`81`	`n.KubeClient = kc`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ func (o sccReviewOptions) Complete(f clientcmd.Factory, args []string, cmd *co`
`107`	`107`	`return fmt.Errorf("unable to obtain client: %v", err)`
`108`	`108`	`}`
`109`	`109`	`o.client = securityClient.Security()`
`110`		`- o.builder = f.NewBuilder(true)`
	`110`	`+ o.builder = f.NewBuilder()`
`111`	`111`	`o.RESTClientFactory = f.ClientForMapping`
`112`	`112`
`113`	`113`	`output := kcmdutil.GetFlagString(cmd, "output")`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ func (o sccSubjectReviewOptions) Complete(f clientcmd.Factory, args []string,`
`108`	`108`	`}`
`109`	`109`	`o.sccSubjectReviewClient = securityClient.Security()`
`110`	`110`	`o.sccSelfSubjectReviewClient = securityClient.Security()`
`111`		`- o.builder = f.NewBuilder(true)`
	`111`	`+ o.builder = f.NewBuilder()`
`112`	`112`	`o.RESTClientFactory = f.ClientForMapping`
`113`	`113`
`114`	`114`	`output := kcmdutil.GetFlagString(cmd, "output")`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ func ImportObjects(f *clientcmd.Factory, ns, location string) error {`
`24`	`24`	`return err`
`25`	`25`	`}`
`26`	`26`	`glog.V(8).Infof("Importing data:\n%s\n", string(data))`
`27`		`- r := f.NewBuilder(true).`
	`27`	`+ r := f.NewBuilder().`
`28`	`28`	`Schema(schema).`
`29`	`29`	`ContinueOnError().`
`30`	`30`	`NamespaceParam(ns).`
Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ func (o DebugOptions) Complete(cmd cobra.Command, f *clientcmd.Factory, args [`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`mapper, _ := f.Object()`
`224`		`- b := f.NewBuilder(true).`
	`224`	`+ b := f.NewBuilder().`
`225`	`225`	`NamespaceParam(cmdNamespace).DefaultNamespace().`
`226`	`226`	`SingleResourceType().`
`227`	`227`	`ResourceNames("pods", resources...).`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ func (o DeployOptions) Complete(f clientcmd.Factory, args []string, out io.Wri`
`155`	`155`	`return err`
`156`	`156`	`}`
`157`	`157`
`158`		`- o.builder = f.NewBuilder(true)`
	`158`	`+ o.builder = f.NewBuilder()`
`159`	`159`	`o.out = out`
`160`	`160`
`161`	`161`	`if len(args) > 0 {`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ func validate(cmd cobra.Command, f clientcmd.Factory, args []string) error {`
`93`	`93`	`return err`
`94`	`94`	`}`
`95`	`95`
`96`		`- r := f.NewBuilder(true).`
	`96`	`+ r := f.NewBuilder().`
`97`	`97`	`ContinueOnError().`
`98`	`98`	`NamespaceParam(namespace).DefaultNamespace().`
`99`	`99`	`FilenameParam(enforceNamespace, &resource.FilenameOptions{Recursive: false, Filenames: kcmdutil.GetFlagStringSlice(cmd, "filename")}).`