Skip to content

Bug 1843929: use wrapper for kustomize sub-command #453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Jun 9, 2020
Merged

Bug 1843929: use wrapper for kustomize sub-command #453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/cli/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (

"k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/kubectl/pkg/cmd/diff"
"k8s.io/kubectl/pkg/cmd/kustomize"

"k8s.io/kubectl/pkg/cmd/plugin"
kcmdutil "k8s.io/kubectl/pkg/cmd/util"
ktemplates "k8s.io/kubectl/pkg/util/templates"
Expand Down Expand Up @@ -229,7 +229,7 @@ func NewOcCommand(name string, in io.Reader, out, errout io.Writer) *cobra.Comma
kubectlwrappers.NewCmdApiResources(name, f, ioStreams),
kubectlwrappers.NewCmdClusterInfo(name, f, ioStreams),
diff.NewCmdDiff(f, ioStreams),
kustomize.NewCmdKustomize(ioStreams),
kubectlwrappers.NewCmdKustomize(name, ioStreams),
},
},
{
Expand Down
5 changes: 5 additions & 0 deletions pkg/cli/kubectlwrappers/wrappers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"k8s.io/kubectl/pkg/cmd/exec"
"k8s.io/kubectl/pkg/cmd/explain"
kget "k8s.io/kubectl/pkg/cmd/get"
"k8s.io/kubectl/pkg/cmd/kustomize"
"k8s.io/kubectl/pkg/cmd/label"
"k8s.io/kubectl/pkg/cmd/patch"
"k8s.io/kubectl/pkg/cmd/plugin"
Expand Down Expand Up @@ -255,3 +256,7 @@ func NewCmdApiResources(fullName string, f kcmdutil.Factory, streams genericclio
func NewCmdApiVersions(fullName string, f kcmdutil.Factory, streams genericclioptions.IOStreams) *cobra.Command {
return cmdutil.ReplaceCommandName("kubectl", fullName, templates.Normalize(apiresources.NewCmdAPIVersions(f, streams)))
}

func NewCmdKustomize(fullName string, streams genericclioptions.IOStreams) *cobra.Command {
return cmdutil.ReplaceCommandName("kubectl", fullName, templates.Normalize(kustomize.NewCmdKustomize(streams)))
}