fluxcd
/
cli-utils
mirror of https://github.com/fluxcd/cli-utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #126 from seans3/apply-preview-fix 

Removes duplicate import; cleans up comment
This commit is contained in:
Kubernetes Prow Robot 2020-04-15 10:02:04 -07:00 committed by GitHub
parent 7637ca284f f4e91669f6
commit 09643102a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/apply/cmdapply.go
View File

@ -10,14 +10,13 @@ import (
"github.com/spf13/cobra"
"k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/kubectl/pkg/cmd/util"
cmdutil "k8s.io/kubectl/pkg/cmd/util"
"k8s.io/kubectl/pkg/util/i18n"
"sigs.k8s.io/cli-utils/cmd/printers"
"sigs.k8s.io/cli-utils/pkg/apply"
)
func GetApplyRunner(f util.Factory, ioStreams genericclioptions.IOStreams) *ApplyRunner {
func GetApplyRunner(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *ApplyRunner {
r := &ApplyRunner{
applier: apply.NewApplier(f, ioStreams),
ioStreams: ioStreams,
@ -52,7 +51,7 @@ func GetApplyRunner(f util.Factory, ioStreams genericclioptions.IOStreams) *Appl
return r
}
func ApplyCommand(f util.Factory, ioStreams genericclioptions.IOStreams) *cobra.Command {
func ApplyCommand(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *cobra.Command {
return GetApplyRunner(f, ioStreams).command
}

5
cmd/preview/cmdpreview.go
View File

@ -8,15 +8,14 @@ import (
"github.com/spf13/cobra"
"k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/kubectl/pkg/cmd/util"
cmdutil "k8s.io/kubectl/pkg/cmd/util"
"k8s.io/kubectl/pkg/util/i18n"
"sigs.k8s.io/cli-utils/pkg/apply"
"sigs.k8s.io/cli-utils/pkg/apply/event"
)
// NewCmdApply creates the `apply` command
func NewCmdPreview(f util.Factory, ioStreams genericclioptions.IOStreams) *cobra.Command {
// NewCmdPreview creates the `preview` command
func NewCmdPreview(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *cobra.Command {
applier := apply.NewApplier(f, ioStreams)
destroyer := apply.NewDestroyer(f, ioStreams)