SOLTYSH: significant changes to diagnostic wiring

deads2k · deads2k · commit 046a74ca33bc · 2018-06-25T16:16:17.000-04:00
diff --git a/pkg/oc/admin/diagnostics/diagnostics.go b/pkg/oc/admin/diagnostics/diagnostics.go
@@ -222,7 +222,7 @@ func (o *DiagnosticsOptions) bindCommonFlags(flags *flag.FlagSet) {
 
 // bind flags that are necessary for setting up an API client
 func (o *DiagnosticsOptions) bindClientFlags(flags *flag.FlagSet) {
-	o.ClientFlags = flag.NewFlagSet("client", flag.ContinueOnError) // hide the extensive set of client flags
+	o.ClientFlags = flags
 	flags.StringVar(&o.ClientClusterContext, options.FlagClusterContextName, "", "Client context to use for cluster administrator")
 	flags.BoolVar(&o.PreventModification, options.FlagPreventModificationName, false, "If true, may be set to prevent diagnostics making any changes via the API")
 }

Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ func (o DiagnosticsOptions) bindCommonFlags(flags flag.FlagSet) {`
`222`	`222`
`223`	`223`	`// bind flags that are necessary for setting up an API client`
`224`	`224`	`func (o DiagnosticsOptions) bindClientFlags(flags flag.FlagSet) {`
`225`		`- o.ClientFlags = flag.NewFlagSet("client", flag.ContinueOnError) // hide the extensive set of client flags`
	`225`	`+ o.ClientFlags = flags`
`226`	`226`	`flags.StringVar(&o.ClientClusterContext, options.FlagClusterContextName, "", "Client context to use for cluster administrator")`
`227`	`227`	`flags.BoolVar(&o.PreventModification, options.FlagPreventModificationName, false, "If true, may be set to prevent diagnostics making any changes via the API")`
`228`	`228`	`}`