Skip to content

K
k3s
Commit fc6db328 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #35859 from madhusudancs/federation-kubefed-init-02

Automatic merge from submit-queue [Federation][init-02] Stop passing command factory to the init command. Please review only the last commit here. This is based on PR #35856 which will be reviewed independently. Design Doc: PR #34484 cc @kubernetes/sig-cluster-federation @nikhiljindal
parents c4eb04af b8109eae
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
federation/pkg/kubefed/init/init.go
View file @ fc6db328
...@@ -94,14 +94,14 @@ var ( ...@@ -94,14 +94,14 @@ var (
// NewCmdInit defines the `init` command that bootstraps a federation // NewCmdInit defines the `init` command that bootstraps a federation
// control plane inside a set of host clusters. // control plane inside a set of host clusters.
func NewCmdInit(f cmdutil.Factory, cmdOut io.Writer, config util.AdminConfig) *cobra.Command { func NewCmdInit(cmdOut io.Writer, config util.AdminConfig) *cobra.Command {
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "init FEDERATION_NAME --host-cluster-context=HOST_CONTEXT", Use: "init FEDERATION_NAME --host-cluster-context=HOST_CONTEXT",
Short: "init initializes a federation control plane", Short: "init initializes a federation control plane",
Long: init_long, Long: init_long,
Example: init_example, Example: init_example,
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
err := initFederation(f, cmdOut, config, cmd, args) err := initFederation(cmdOut, config, cmd, args)
cmdutil.CheckErr(err) cmdutil.CheckErr(err)
}, },
} }
...@@ -120,7 +120,7 @@ type entityKeyPairs struct { ...@@ -120,7 +120,7 @@ type entityKeyPairs struct {
// initFederation initializes a federation control plane. // initFederation initializes a federation control plane.
// See the design doc in https://github.com/kubernetes/kubernetes/pull/34484 // See the design doc in https://github.com/kubernetes/kubernetes/pull/34484
// for details. // for details.
func initFederation(f cmdutil.Factory, cmdOut io.Writer, config util.AdminConfig, cmd *cobra.Command, args []string) error { func initFederation(cmdOut io.Writer, config util.AdminConfig, cmd *cobra.Command, args []string) error {
initFlags, err := util.GetSubcommandFlags(cmd, args) initFlags, err := util.GetSubcommandFlags(cmd, args)
if err != nil { if err != nil {
return err return err
......
federation/pkg/kubefed/kubefed.go
View file @ fc6db328
...@@ -53,7 +53,7 @@ func NewKubeFedCommand(f cmdutil.Factory, in io.Reader, out, err io.Writer) *cob ...@@ -53,7 +53,7 @@ func NewKubeFedCommand(f cmdutil.Factory, in io.Reader, out, err io.Writer) *cob
{ {
Message: "Basic Commands:", Message: "Basic Commands:",
Commands: []*cobra.Command{ Commands: []*cobra.Command{
kubefedinit.NewCmdInit(f, out, util.NewAdminConfig(clientcmd.NewDefaultPathOptions())), kubefedinit.NewCmdInit(out, util.NewAdminConfig(clientcmd.NewDefaultPathOptions())),
NewCmdJoin(f, out, util.NewAdminConfig(clientcmd.NewDefaultPathOptions())), NewCmdJoin(f, out, util.NewAdminConfig(clientcmd.NewDefaultPathOptions())),
NewCmdUnjoin(f, out, err, util.NewAdminConfig(clientcmd.NewDefaultPathOptions())), NewCmdUnjoin(f, out, err, util.NewAdminConfig(clientcmd.NewDefaultPathOptions())),
}, },
......
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