Commit eadb6b18 authored by Sean Sullivan's avatar Sean Sullivan

More cleanup

parent d7358355
...@@ -71,7 +71,7 @@ type RolloutStatusOptions struct { ...@@ -71,7 +71,7 @@ type RolloutStatusOptions struct {
Revision int64 Revision int64
Timeout time.Duration Timeout time.Duration
StatusViewer func(*meta.RESTMapping) (kubectl.StatusViewer, error) StatusViewerFn func(*meta.RESTMapping) (kubectl.StatusViewer, error)
Builder func() *resource.Builder Builder func() *resource.Builder
DynamicClient dynamic.Interface DynamicClient dynamic.Interface
...@@ -127,9 +127,7 @@ func (o *RolloutStatusOptions) Complete(f cmdutil.Factory, args []string) error ...@@ -127,9 +127,7 @@ func (o *RolloutStatusOptions) Complete(f cmdutil.Factory, args []string) error
} }
o.BuilderArgs = args o.BuilderArgs = args
o.StatusViewer = func(mapping *meta.RESTMapping) (kubectl.StatusViewer, error) { o.StatusViewerFn = polymorphichelpers.StatusViewerFn
return polymorphichelpers.StatusViewerFn(mapping)
}
clientConfig, err := f.ToRESTConfig() clientConfig, err := f.ToRESTConfig()
if err != nil { if err != nil {
...@@ -180,7 +178,7 @@ func (o *RolloutStatusOptions) Run() error { ...@@ -180,7 +178,7 @@ func (o *RolloutStatusOptions) Run() error {
info := infos[0] info := infos[0]
mapping := info.ResourceMapping() mapping := info.ResourceMapping()
statusViewer, err := o.StatusViewer(mapping) statusViewer, err := o.StatusViewerFn(mapping)
if err != nil { if err != nil {
return err return err
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment