chore(cmd): init kube flags only when needed

Signed-off-by: Leonardo Grasso <[email protected]>

Author: leogr

cmd/delete.go

@@ -17,7 +17,6 @@ limitations under the License.
 package cmd
 
 import (
-	"github.com/falcosecurity/falcoctl/pkg/kubernetes/factory"
 	"github.com/spf13/cobra"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 )
@@ -40,7 +39,7 @@ func NewDeleteOptions(streams genericclioptions.IOStreams) CommandOptions {
 }
 
 // Delete creates the `delete` command
-func Delete(streams genericclioptions.IOStreams, f factory.Factory) *cobra.Command {
+func Delete(streams genericclioptions.IOStreams) *cobra.Command {
 	// o := NewDeleteOptions(streams).(*DeleteOptions)
 
 	cmd := &cobra.Command{
@@ -50,7 +49,7 @@ func Delete(streams genericclioptions.IOStreams, f factory.Factory) *cobra.Comma
 		Long:                  `Delete a component with falcoctl`,
 	}
 
-	cmd.AddCommand(DeleteFalco(streams, f))
+	cmd.AddCommand(DeleteFalco(streams))
 
 	return cmd
 }

cmd/delete_falco.go

@@ -47,17 +47,18 @@ func NewFalcoDeleteOptions(streams genericclioptions.IOStreams) CommandOptions {
 }
 
 // DeleteFalco creates the `delete falco` command
-func DeleteFalco(streams genericclioptions.IOStreams, f factory.Factory) *cobra.Command {
+func DeleteFalco(streams genericclioptions.IOStreams) *cobra.Command {
 	o := NewFalcoDeleteOptions(streams).(*FalcoDeleteOptions)
 
+	var clientGetter genericclioptions.RESTClientGetter
 	cmd := &cobra.Command{
 		Use:                   "falco",
 		DisableFlagsInUseLine: true,
 		Short:                 "Delete Falco from Kubernetes",
 		Long:                  `Delete Falco from Kubernetes`,
 		Run: func(cmd *cobra.Command, args []string) {
 			// todo > pass daemonset name using o.daemonSetName
-			installer, err := kubernetesfalc.NewFalcoInstaller(f)
+			installer, err := kubernetesfalc.NewFalcoInstaller(factory.New(clientGetter))
 			if err != nil {
 				logger.Critical("Fatal error: %v", err)
 				os.Exit(1)
@@ -70,6 +71,7 @@ func DeleteFalco(streams genericclioptions.IOStreams, f factory.Factory) *cobra.
 		},
 	}
 
+	clientGetter = initKubeFlags(cmd.PersistentFlags())
 	cmd.Flags().StringVarP(&o.daemonSetName, "daemonset-name", "D", o.daemonSetName, "Set the name to use with the Falco DaemonSet")
 
 	return cmd

cmd/install.go

@@ -17,7 +17,6 @@ limitations under the License.
 package cmd
 
 import (
-	"github.com/falcosecurity/falcoctl/pkg/kubernetes/factory"
 	"github.com/spf13/cobra"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 )
@@ -40,7 +39,7 @@ func NewInstallOptions(streams genericclioptions.IOStreams) CommandOptions {
 }
 
 // Install creates the `install` command
-func Install(streams genericclioptions.IOStreams, f factory.Factory) *cobra.Command {
+func Install(streams genericclioptions.IOStreams) *cobra.Command {
 	// o := NewInstallOptions(streams).(*InstallOptions)
 
 	cmd := &cobra.Command{
@@ -51,7 +50,7 @@ func Install(streams genericclioptions.IOStreams, f factory.Factory) *cobra.Comm
 		Long:                  `Install a component with falcoctl`,
 	}
 
-	cmd.AddCommand(InstallFalco(streams, f))
+	cmd.AddCommand(InstallFalco(streams))
 	cmd.AddCommand(InstallModule(streams))
 	cmd.AddCommand(InstallTLS(streams))
 	cmd.AddCommand(InstallRule(streams))

cmd/install_falco.go

@@ -46,9 +46,10 @@ func NewFalcoOptions(streams genericclioptions.IOStreams) CommandOptions {
 }
 
 // InstallFalco creates the `install falco` command
-func InstallFalco(streams genericclioptions.IOStreams, f factory.Factory) *cobra.Command {
+func InstallFalco(streams genericclioptions.IOStreams) *cobra.Command {
 	o := NewFalcoOptions(streams).(*FalcoOptions)
 
+	var clientGetter genericclioptions.RESTClientGetter
 	cmd := &cobra.Command{
 		Use:                   "falco",
 		TraverseChildren:      true,
@@ -57,7 +58,7 @@ func InstallFalco(streams genericclioptions.IOStreams, f factory.Factory) *cobra
 		Long:                  `Deploy Falco to Kubernetes`,
 		Run: func(cmd *cobra.Command, args []string) {
 			// todo > pass daemonset name using o.daemonSetName
-			installer, err := kubernetesfalc.NewFalcoInstaller(f)
+			installer, err := kubernetesfalc.NewFalcoInstaller(factory.New(clientGetter))
 			if err != nil {
 				logger.Critical("Fatal error: %v", err)
 				os.Exit(1)
@@ -70,6 +71,7 @@ func InstallFalco(streams genericclioptions.IOStreams, f factory.Factory) *cobra
 		},
 	}
 
+	clientGetter = initKubeFlags(cmd.PersistentFlags())
 	cmd.Flags().StringVarP(&o.daemonSetName, "daemonset-name", "D", o.daemonSetName, "Set the name to use with the Falco DaemonSet")
 
 	return cmd

cmd/root.go

@@ -22,9 +22,11 @@ import (
 
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 
+	"github.com/falcosecurity/falcoctl/pkg/kubernetes/factory"
 	"github.com/kris-nova/logger"
 	"github.com/mitchellh/go-homedir"
 	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
 )
 
@@ -106,3 +108,12 @@ func initConfig(configOptions *ConfigOptions) {
 		}
 	}
 }
+
+func initKubeFlags(flags *pflag.FlagSet) genericclioptions.RESTClientGetter {
+	configFlags := genericclioptions.NewConfigFlags(false)
+	configFlags.AddFlags(flags)
+
+	matchVersionFlags := factory.MatchVersion(configFlags)
+	matchVersionFlags.AddFlags(flags)
+	return matchVersionFlags
+}