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

Merge pull request #2164 from carlory/iostreams 

take iostreams as a func parameter
This commit is contained in:
karmada-bot 2022-07-28 08:54:53 +08:00 committed by GitHub
parent dabdbea0fb dfa793f229
commit 6bd9f68a0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/karmadactl/apply.go
View File

@ -63,18 +63,11 @@ var (
%[1]s apply -f dir/ --all-clusters`)
)
// NewCommandApplyOptions returns an initialized CommandApplyOptions instance
func NewCommandApplyOptions() *CommandApplyOptions {
streams := genericclioptions.IOStreams{In: getIn, Out: getOut, ErrOut: getErr}
flags := kubectlapply.NewApplyFlags(nil, streams)
return &CommandApplyOptions{
KubectlApplyFlags: flags,
}
}
// NewCmdApply creates the `apply` command
func NewCmdApply(karmadaConfig KarmadaConfig, parentCommand string) *cobra.Command {
o := NewCommandApplyOptions()
func NewCmdApply(karmadaConfig KarmadaConfig, parentCommand string, streams genericclioptions.IOStreams) *cobra.Command {
o := &CommandApplyOptions{
KubectlApplyFlags: kubectlapply.NewApplyFlags(nil, streams),
}
cmd := &cobra.Command{
Use: "apply (-f FILENAME | -k DIRECTORY)",
Short: "Apply a configuration to a resource by file name or stdin and propagate them into member clusters",

5
pkg/karmadactl/describe.go
View File

@ -38,8 +38,7 @@ var (
)
// NewCmdDescribe new describe command.
func NewCmdDescribe(karmadaConfig KarmadaConfig, parentCommand string) *cobra.Command {
ioStreams := genericclioptions.IOStreams{In: getIn, Out: getOut, ErrOut: getErr}
func NewCmdDescribe(karmadaConfig KarmadaConfig, parentCommand string, streams genericclioptions.IOStreams) *cobra.Command {
o := &CommandDescribeOptions{
FilenameOptions: &resource.FilenameOptions{},
DescriberSettings: &describe.DescriberSettings{
@ -49,7 +48,7 @@ func NewCmdDescribe(karmadaConfig KarmadaConfig, parentCommand string) *cobra.Co
CmdParent: parentCommand,
IOStreams: ioStreams,
IOStreams: streams,
}
cmd := &cobra.Command{

3
pkg/karmadactl/exec.go
View File

@ -40,8 +40,7 @@ var (
)
// NewCmdExec new exec command.
func NewCmdExec(karmadaConfig KarmadaConfig, parentCommand string) *cobra.Command {
streams := genericclioptions.IOStreams{In: getIn, Out: getOut, ErrOut: getErr}
func NewCmdExec(karmadaConfig KarmadaConfig, parentCommand string, streams genericclioptions.IOStreams) *cobra.Command {
o := &ExecOptions{
KubectlExecOptions: &kubectlexec.ExecOptions{
StreamOptions: kubectlexec.StreamOptions{

9
pkg/karmadactl/get.go
View File

@ -49,10 +49,6 @@ const (
)
var (
getIn = os.Stdin
getOut = os.Stdout
getErr = os.Stderr
podColumns = []metav1.TableColumnDefinition{
{Name: "CLUSTER", Type: "string", Format: "", Priority: 0},
{Name: "ADOPTION", Type: "string", Format: "", Priority: 0},
@ -88,9 +84,8 @@ var (
)
// NewCmdGet New get command
func NewCmdGet(karmadaConfig KarmadaConfig, parentCommand string) *cobra.Command {
ioStreams := genericclioptions.IOStreams{In: getIn, Out: getOut, ErrOut: getErr}
o := NewCommandGetOptions(ioStreams)
func NewCmdGet(karmadaConfig KarmadaConfig, parentCommand string, streams genericclioptions.IOStreams) *cobra.Command {
o := NewCommandGetOptions(streams)
cmd := &cobra.Command{
Use: "get [NAME | -l label | -n namespace] [flags]",
Short: getShort,

14
pkg/karmadactl/karmadactl.go
View File

@ -3,9 +3,11 @@ package karmadactl
import (
"flag"
"fmt"
"os"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
"k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/client-go/tools/clientcmd"
apiserverflag "k8s.io/component-base/cli/flag"
"k8s.io/klog/v2"
@ -47,12 +49,12 @@ func NewKarmadaCtlCommand(cmdUse, parentCommand string) *cobra.Command {
_ = flag.CommandLine.Parse(nil)
karmadaConfig := NewKarmadaConfig(clientcmd.NewDefaultPathOptions())
ioStreams := genericclioptions.IOStreams{In: os.Stdin, Out: os.Stdout, ErrOut: os.Stderr}
groups := templates.CommandGroups{
{
Message: "Basic Commands:",
Commands: []*cobra.Command{
NewCmdGet(karmadaConfig, parentCommand),
NewCmdGet(karmadaConfig, parentCommand, ioStreams),
},
},
{
@ -75,15 +77,15 @@ func NewKarmadaCtlCommand(cmdUse, parentCommand string) *cobra.Command {
{
Message: "Troubleshooting and Debugging Commands:",
Commands: []*cobra.Command{
NewCmdLogs(karmadaConfig, parentCommand),
NewCmdExec(karmadaConfig, parentCommand),
NewCmdDescribe(karmadaConfig, parentCommand),
NewCmdLogs(karmadaConfig, parentCommand, ioStreams),
NewCmdExec(karmadaConfig, parentCommand, ioStreams),
NewCmdDescribe(karmadaConfig, parentCommand, ioStreams),
},
},
{
Message: "Advanced Commands:",
Commands: []*cobra.Command{
NewCmdApply(karmadaConfig, parentCommand),
NewCmdApply(karmadaConfig, parentCommand, ioStreams),
NewCmdPromote(karmadaConfig, parentCommand),
},
},

3
pkg/karmadactl/logs.go
View File

@ -50,8 +50,7 @@ var (
)
// NewCmdLogs new logs command.
func NewCmdLogs(karmadaConfig KarmadaConfig, parentCommand string) *cobra.Command {
streams := genericclioptions.IOStreams{In: getIn, Out: getOut, ErrOut: getErr}
func NewCmdLogs(karmadaConfig KarmadaConfig, parentCommand string, streams genericclioptions.IOStreams) *cobra.Command {
o := &LogsOptions{
KubectlLogsOptions: kubectllogs.NewLogsOptions(streams, false),
}