Merge pull request #366 from twelho/runtime-selection

Implement runtime selection, only load necessary providers

cmd/ignite/cmd/root.go

@@ -7,24 +7,25 @@ import (
 
 	"github.com/lithammer/dedent"
 	"github.com/sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"github.com/weaveworks/ignite/cmd/ignite/cmd/imgcmd"
 	"github.com/weaveworks/ignite/cmd/ignite/cmd/kerncmd"
 	"github.com/weaveworks/ignite/cmd/ignite/cmd/vmcmd"
 	"github.com/weaveworks/ignite/pkg/logs"
 	logflag "github.com/weaveworks/ignite/pkg/logs/flag"
-	"github.com/weaveworks/ignite/pkg/network"
 	networkflag "github.com/weaveworks/ignite/pkg/network/flag"
 	"github.com/weaveworks/ignite/pkg/providers"
+	"github.com/weaveworks/ignite/pkg/providers/ignite"
+	runtimeflag "github.com/weaveworks/ignite/pkg/runtime/flag"
 	versioncmd "github.com/weaveworks/ignite/pkg/version/cmd"
 )
 
 var logLevel = logrus.InfoLevel
 
 // NewIgniteCommand returns the root command for ignite
 func NewIgniteCommand(in io.Reader, out, err io.Writer) *cobra.Command {
-
 	imageCmd := imgcmd.NewCmdImage(os.Stdout)
 	kernelCmd := kerncmd.NewCmdKernel(os.Stdout)
 	vmCmd := vmcmd.NewCmdVM(os.Stdout)
@@ -35,8 +36,11 @@ func NewIgniteCommand(in io.Reader, out, err io.Writer) *cobra.Command {
 		PersistentPreRun: func(cmd *cobra.Command, args []string) {
 			// Set the desired logging level, now that the flags are parsed
 			logs.Logger.SetLevel(logLevel)
-			// Set the desired network plugin
-			providers.NetworkPlugin = providers.NetworkPlugins[network.ActivePlugin]
+
+			// Populate the providers after flags have been parsed
+			if err := providers.Populate(ignite.Providers); err != nil {
+				log.Fatal(err)
+			}
 		},
 		Long: dedent.Dedent(fmt.Sprintf(`
 			Ignite is a containerized Firecracker microVM administration tool.
@@ -93,7 +97,8 @@ func NewIgniteCommand(in io.Reader, out, err io.Writer) *cobra.Command {
 func addGlobalFlags(fs *pflag.FlagSet) {
 	AddQuietFlag(fs)
 	logflag.LogLevelFlagVar(fs, &logLevel)
-	networkflag.RegisterNetworkPluginFlag(fs)
+	runtimeflag.RuntimeVar(fs, &providers.RuntimeName)
+	networkflag.NetworkPluginVar(fs, &providers.NetworkPluginName)
 }
 
 // AddQuietFlag adds the quiet flag to a flagset

cmd/ignite/ignite.go

@@ -25,8 +25,8 @@ func Run() error {
 	// Create the directories needed for running
 	util.GenericCheckErr(util.CreateDirectories())
 
-	// Populate the providers
-	util.GenericCheckErr(providers.Populate(ignite.Providers))
+	// Preload necessary providers
+	util.GenericCheckErr(providers.Populate(ignite.Preload))
 
 	c := cmd.NewIgniteCommand(os.Stdin, os.Stdout, os.Stderr)
 	return c.Execute()

cmd/ignited/cmd/root.go

@@ -6,29 +6,33 @@ import (
 
 	"github.com/lithammer/dedent"
 	"github.com/sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"github.com/weaveworks/ignite/pkg/logs"
 	logflag "github.com/weaveworks/ignite/pkg/logs/flag"
-	"github.com/weaveworks/ignite/pkg/network"
 	networkflag "github.com/weaveworks/ignite/pkg/network/flag"
 	"github.com/weaveworks/ignite/pkg/providers"
+	"github.com/weaveworks/ignite/pkg/providers/ignite"
+	runtimeflag "github.com/weaveworks/ignite/pkg/runtime/flag"
 	versioncmd "github.com/weaveworks/ignite/pkg/version/cmd"
 )
 
 var logLevel = logrus.InfoLevel
 
 // NewIgnitedCommand returns the root command for ignited
 func NewIgnitedCommand(in io.Reader, out, err io.Writer) *cobra.Command {
-
 	root := &cobra.Command{
 		Use:   "ignited",
 		Short: "ignited: run Firecracker VMs declaratively through a manifest directory or Git",
 		PersistentPreRun: func(cmd *cobra.Command, args []string) {
 			// Set the desired logging level, now that the flags are parsed
 			logs.Logger.SetLevel(logLevel)
-			// Set the desired network plugin
-			providers.NetworkPlugin = providers.NetworkPlugins[network.ActivePlugin]
+
+			// Populate the providers after flags have been parsed
+			if err := providers.Populate(ignite.Providers); err != nil {
+				log.Fatal(err)
+			}
 		},
 		Long: dedent.Dedent(`
 			Ignite is a containerized Firecracker microVM administration tool.
@@ -49,5 +53,6 @@ func NewIgnitedCommand(in io.Reader, out, err io.Writer) *cobra.Command {
 
 func addGlobalFlags(fs *pflag.FlagSet) {
 	logflag.LogLevelFlagVar(fs, &logLevel)
-	networkflag.RegisterNetworkPluginFlag(fs)
+	runtimeflag.RuntimeVar(fs, &providers.RuntimeName)
+	networkflag.NetworkPluginVar(fs, &providers.NetworkPluginName)
 }

cmd/ignited/ignited.go

@@ -25,8 +25,8 @@ func Run() error {
 	// Create the directories needed for running
 	util.GenericCheckErr(util.CreateDirectories())
 
-	// Populate the providers
-	util.GenericCheckErr(providers.Populate(ignited.Providers))
+	// Preload necessary providers
+	util.GenericCheckErr(providers.Populate(ignited.Preload))
 
 	c := cmd.NewIgnitedCommand(os.Stdin, os.Stdout, os.Stderr)
 	return c.Execute()

docs/cli/ignite/ignite.md

@@ -37,6 +37,7 @@ Example usage:
       --log-level loglevel      Specify the loglevel for the program (default info)
       --network-plugin plugin   Network plugin to use. Available options are: [cni docker-bridge] (default docker-bridge)
   -q, --quiet                   The quiet mode allows for machine-parsable output by printing only IDs
+      --runtime runtime         Container runtime to use. Available options are: [docker containerd] (default docker)
 ```
 
 ### SEE ALSO

docs/cli/ignite/ignite_attach.md

@@ -26,6 +26,7 @@ ignite attach <vm> [flags]
       --log-level loglevel      Specify the loglevel for the program (default info)
       --network-plugin plugin   Network plugin to use. Available options are: [cni docker-bridge] (default docker-bridge)
   -q, --quiet                   The quiet mode allows for machine-parsable output by printing only IDs
+      --runtime runtime         Container runtime to use. Available options are: [docker containerd] (default docker)
 ```
 
 ### SEE ALSO

docs/cli/ignite/ignite_completion.md

@@ -30,6 +30,7 @@ ignite completion [flags]
       --log-level loglevel      Specify the loglevel for the program (default info)
       --network-plugin plugin   Network plugin to use. Available options are: [cni docker-bridge] (default docker-bridge)
   -q, --quiet                   The quiet mode allows for machine-parsable output by printing only IDs
+      --runtime runtime         Container runtime to use. Available options are: [docker containerd] (default docker)
 ```
 
 ### SEE ALSO

docs/cli/ignite/ignite_create.md

@@ -54,6 +54,7 @@ ignite create <OCI image> [flags]
       --log-level loglevel      Specify the loglevel for the program (default info)
       --network-plugin plugin   Network plugin to use. Available options are: [cni docker-bridge] (default docker-bridge)
   -q, --quiet                   The quiet mode allows for machine-parsable output by printing only IDs
+      --runtime runtime         Container runtime to use. Available options are: [docker containerd] (default docker)
 ```
 
 ### SEE ALSO

docs/cli/ignite/ignite_exec.md

@@ -29,6 +29,7 @@ ignite exec <vm> <command...> [flags]
       --log-level loglevel      Specify the loglevel for the program (default info)
       --network-plugin plugin   Network plugin to use. Available options are: [cni docker-bridge] (default docker-bridge)
   -q, --quiet                   The quiet mode allows for machine-parsable output by printing only IDs
+      --runtime runtime         Container runtime to use. Available options are: [docker containerd] (default docker)
 ```
 
 ### SEE ALSO

docs/cli/ignite/ignite_image.md

@@ -25,6 +25,7 @@ ignite image [flags]
       --log-level loglevel      Specify the loglevel for the program (default info)
       --network-plugin plugin   Network plugin to use. Available options are: [cni docker-bridge] (default docker-bridge)
   -q, --quiet                   The quiet mode allows for machine-parsable output by printing only IDs
+      --runtime runtime         Container runtime to use. Available options are: [docker containerd] (default docker)
 ```
 
 ### SEE ALSO

docs/cli/ignite/ignite_image_import.md

@@ -26,6 +26,7 @@ ignite image import <OCI image> [flags]
       --log-level loglevel      Specify the loglevel for the program (default info)
       --network-plugin plugin   Network plugin to use. Available options are: [cni docker-bridge] (default docker-bridge)
   -q, --quiet                   The quiet mode allows for machine-parsable output by printing only IDs
+      --runtime runtime         Container runtime to use. Available options are: [docker containerd] (default docker)
 ```
 
 ### SEE ALSO

docs/cli/ignite/ignite_image_ls.md

@@ -24,6 +24,7 @@ ignite image ls [flags]
       --log-level loglevel      Specify the loglevel for the program (default info)
       --network-plugin plugin   Network plugin to use. Available options are: [cni docker-bridge] (default docker-bridge)
   -q, --quiet                   The quiet mode allows for machine-parsable output by printing only IDs
+      --runtime runtime         Container runtime to use. Available options are: [docker containerd] (default docker)
 ```
 
 ### SEE ALSO

docs/cli/ignite/ignite_image_rm.md

@@ -27,6 +27,7 @@ ignite image rm <image>... [flags]
       --log-level loglevel      Specify the loglevel for the program (default info)
       --network-plugin plugin   Network plugin to use. Available options are: [cni docker-bridge] (default docker-bridge)
   -q, --quiet                   The quiet mode allows for machine-parsable output by printing only IDs
+      --runtime runtime         Container runtime to use. Available options are: [docker containerd] (default docker)
 ```
 
 ### SEE ALSO

docs/cli/ignite/ignite_inspect.md

@@ -28,6 +28,7 @@ ignite inspect <kind> <object> [flags]
       --log-level loglevel      Specify the loglevel for the program (default info)
       --network-plugin plugin   Network plugin to use. Available options are: [cni docker-bridge] (default docker-bridge)
   -q, --quiet                   The quiet mode allows for machine-parsable output by printing only IDs
+      --runtime runtime         Container runtime to use. Available options are: [docker containerd] (default docker)
 ```
 
 ### SEE ALSO

docs/cli/ignite/ignite_kernel.md

@@ -25,6 +25,7 @@ ignite kernel [flags]
       --log-level loglevel      Specify the loglevel for the program (default info)
       --network-plugin plugin   Network plugin to use. Available options are: [cni docker-bridge] (default docker-bridge)
   -q, --quiet                   The quiet mode allows for machine-parsable output by printing only IDs
+      --runtime runtime         Container runtime to use. Available options are: [docker containerd] (default docker)
 ```
 
 ### SEE ALSO

docs/cli/ignite/ignite_kernel_import.md

@@ -26,6 +26,7 @@ ignite kernel import <OCI image> [flags]
       --log-level loglevel      Specify the loglevel for the program (default info)
       --network-plugin plugin   Network plugin to use. Available options are: [cni docker-bridge] (default docker-bridge)
   -q, --quiet                   The quiet mode allows for machine-parsable output by printing only IDs
+      --runtime runtime         Container runtime to use. Available options are: [docker containerd] (default docker)
 ```
 
 ### SEE ALSO

docs/cli/ignite/ignite_kernel_ls.md

@@ -24,6 +24,7 @@ ignite kernel ls [flags]
       --log-level loglevel      Specify the loglevel for the program (default info)
       --network-plugin plugin   Network plugin to use. Available options are: [cni docker-bridge] (default docker-bridge)
   -q, --quiet                   The quiet mode allows for machine-parsable output by printing only IDs
+      --runtime runtime         Container runtime to use. Available options are: [docker containerd] (default docker)
 ```
 
 ### SEE ALSO

docs/cli/ignite/ignite_kernel_rm.md

@@ -27,6 +27,7 @@ ignite kernel rm <kernel>... [flags]
       --log-level loglevel      Specify the loglevel for the program (default info)
       --network-plugin plugin   Network plugin to use. Available options are: [cni docker-bridge] (default docker-bridge)
   -q, --quiet                   The quiet mode allows for machine-parsable output by printing only IDs
+      --runtime runtime         Container runtime to use. Available options are: [docker containerd] (default docker)
 ```
 
 ### SEE ALSO

docs/cli/ignite/ignite_kill.md

@@ -26,6 +26,7 @@ ignite kill <vm>... [flags]
       --log-level loglevel      Specify the loglevel for the program (default info)
       --network-plugin plugin   Network plugin to use. Available options are: [cni docker-bridge] (default docker-bridge)
   -q, --quiet                   The quiet mode allows for machine-parsable output by printing only IDs
+      --runtime runtime         Container runtime to use. Available options are: [docker containerd] (default docker)
 ```
 
 ### SEE ALSO

docs/cli/ignite/ignite_logs.md

@@ -25,6 +25,7 @@ ignite logs <vm> [flags]
       --log-level loglevel      Specify the loglevel for the program (default info)
       --network-plugin plugin   Network plugin to use. Available options are: [cni docker-bridge] (default docker-bridge)
   -q, --quiet                   The quiet mode allows for machine-parsable output by printing only IDs
+      --runtime runtime         Container runtime to use. Available options are: [docker containerd] (default docker)
 ```
 
 ### SEE ALSO

docs/cli/ignite/ignite_ps.md

@@ -26,6 +26,7 @@ ignite ps [flags]
       --log-level loglevel      Specify the loglevel for the program (default info)
       --network-plugin plugin   Network plugin to use. Available options are: [cni docker-bridge] (default docker-bridge)
   -q, --quiet                   The quiet mode allows for machine-parsable output by printing only IDs
+      --runtime runtime         Container runtime to use. Available options are: [docker containerd] (default docker)
 ```
 
 ### SEE ALSO

docs/cli/ignite/ignite_rm.md

@@ -28,6 +28,7 @@ ignite rm <vm>... [flags]
       --log-level loglevel      Specify the loglevel for the program (default info)
       --network-plugin plugin   Network plugin to use. Available options are: [cni docker-bridge] (default docker-bridge)
   -q, --quiet                   The quiet mode allows for machine-parsable output by printing only IDs
+      --runtime runtime         Container runtime to use. Available options are: [docker containerd] (default docker)
 ```
 
 ### SEE ALSO

docs/cli/ignite/ignite_rmi.md

@@ -27,6 +27,7 @@ ignite rmi <image> [flags]
       --log-level loglevel      Specify the loglevel for the program (default info)
       --network-plugin plugin   Network plugin to use. Available options are: [cni docker-bridge] (default docker-bridge)
   -q, --quiet                   The quiet mode allows for machine-parsable output by printing only IDs
+      --runtime runtime         Container runtime to use. Available options are: [docker containerd] (default docker)
 ```
 
 ### SEE ALSO

docs/cli/ignite/ignite_rmk.md

@@ -27,6 +27,7 @@ ignite rmk <kernel> [flags]
       --log-level loglevel      Specify the loglevel for the program (default info)
       --network-plugin plugin   Network plugin to use. Available options are: [cni docker-bridge] (default docker-bridge)
   -q, --quiet                   The quiet mode allows for machine-parsable output by printing only IDs
+      --runtime runtime         Container runtime to use. Available options are: [docker containerd] (default docker)
 ```
 
 ### SEE ALSO

docs/cli/ignite/ignite_run.md

@@ -49,6 +49,7 @@ ignite run <OCI image> [flags]
       --log-level loglevel      Specify the loglevel for the program (default info)
       --network-plugin plugin   Network plugin to use. Available options are: [cni docker-bridge] (default docker-bridge)
   -q, --quiet                   The quiet mode allows for machine-parsable output by printing only IDs
+      --runtime runtime         Container runtime to use. Available options are: [docker containerd] (default docker)
 ```
 
 ### SEE ALSO

docs/cli/ignite/ignite_ssh.md

@@ -29,6 +29,7 @@ ignite ssh <vm> [flags]
       --log-level loglevel      Specify the loglevel for the program (default info)
       --network-plugin plugin   Network plugin to use. Available options are: [cni docker-bridge] (default docker-bridge)
   -q, --quiet                   The quiet mode allows for machine-parsable output by printing only IDs
+      --runtime runtime         Container runtime to use. Available options are: [docker containerd] (default docker)
 ```
 
 ### SEE ALSO

docs/cli/ignite/ignite_start.md

@@ -28,6 +28,7 @@ ignite start <vm> [flags]
       --log-level loglevel      Specify the loglevel for the program (default info)
       --network-plugin plugin   Network plugin to use. Available options are: [cni docker-bridge] (default docker-bridge)
   -q, --quiet                   The quiet mode allows for machine-parsable output by printing only IDs
+      --runtime runtime         Container runtime to use. Available options are: [docker containerd] (default docker)
 ```
 
 ### SEE ALSO

docs/cli/ignite/ignite_stop.md

@@ -31,6 +31,7 @@ ignite stop <vm>... [flags]
       --log-level loglevel      Specify the loglevel for the program (default info)
       --network-plugin plugin   Network plugin to use. Available options are: [cni docker-bridge] (default docker-bridge)
   -q, --quiet                   The quiet mode allows for machine-parsable output by printing only IDs
+      --runtime runtime         Container runtime to use. Available options are: [docker containerd] (default docker)
 ```
 
 ### SEE ALSO

docs/cli/ignite/ignite_version.md

@@ -23,6 +23,7 @@ ignite version [flags]
       --log-level loglevel      Specify the loglevel for the program (default info)
       --network-plugin plugin   Network plugin to use. Available options are: [cni docker-bridge] (default docker-bridge)
   -q, --quiet                   The quiet mode allows for machine-parsable output by printing only IDs
+      --runtime runtime         Container runtime to use. Available options are: [docker containerd] (default docker)
 ```
 
 ### SEE ALSO

docs/cli/ignite/ignite_vm.md

@@ -24,6 +24,7 @@ ignite vm [flags]
       --log-level loglevel      Specify the loglevel for the program (default info)
       --network-plugin plugin   Network plugin to use. Available options are: [cni docker-bridge] (default docker-bridge)
   -q, --quiet                   The quiet mode allows for machine-parsable output by printing only IDs
+      --runtime runtime         Container runtime to use. Available options are: [docker containerd] (default docker)
 ```
 
 ### SEE ALSO

docs/cli/ignite/ignite_vm_attach.md

@@ -26,6 +26,7 @@ ignite vm attach <vm> [flags]
       --log-level loglevel      Specify the loglevel for the program (default info)
       --network-plugin plugin   Network plugin to use. Available options are: [cni docker-bridge] (default docker-bridge)
   -q, --quiet                   The quiet mode allows for machine-parsable output by printing only IDs
+      --runtime runtime         Container runtime to use. Available options are: [docker containerd] (default docker)
 ```
 
 ### SEE ALSO

docs/cli/ignite/ignite_vm_create.md

@@ -54,6 +54,7 @@ ignite vm create <OCI image> [flags]
       --log-level loglevel      Specify the loglevel for the program (default info)
       --network-plugin plugin   Network plugin to use. Available options are: [cni docker-bridge] (default docker-bridge)
   -q, --quiet                   The quiet mode allows for machine-parsable output by printing only IDs
+      --runtime runtime         Container runtime to use. Available options are: [docker containerd] (default docker)
 ```
 
 ### SEE ALSO

docs/cli/ignite/ignite_vm_kill.md

@@ -26,6 +26,7 @@ ignite vm kill <vm>... [flags]
       --log-level loglevel      Specify the loglevel for the program (default info)
       --network-plugin plugin   Network plugin to use. Available options are: [cni docker-bridge] (default docker-bridge)
   -q, --quiet                   The quiet mode allows for machine-parsable output by printing only IDs
+      --runtime runtime         Container runtime to use. Available options are: [docker containerd] (default docker)
 ```
 
 ### SEE ALSO

docs/cli/ignite/ignite_vm_logs.md

@@ -25,6 +25,7 @@ ignite vm logs <vm> [flags]
       --log-level loglevel      Specify the loglevel for the program (default info)
       --network-plugin plugin   Network plugin to use. Available options are: [cni docker-bridge] (default docker-bridge)
   -q, --quiet                   The quiet mode allows for machine-parsable output by printing only IDs
+      --runtime runtime         Container runtime to use. Available options are: [docker containerd] (default docker)
 ```
 
 ### SEE ALSO

docs/cli/ignite/ignite_vm_ps.md

@@ -26,6 +26,7 @@ ignite vm ps [flags]
       --log-level loglevel      Specify the loglevel for the program (default info)
       --network-plugin plugin   Network plugin to use. Available options are: [cni docker-bridge] (default docker-bridge)
   -q, --quiet                   The quiet mode allows for machine-parsable output by printing only IDs
+      --runtime runtime         Container runtime to use. Available options are: [docker containerd] (default docker)
 ```
 
 ### SEE ALSO