From 76b7450b021736cb1abf423fb7a3d92eeba2c925 Mon Sep 17 00:00:00 2001 From: iwilltry42 Date: Fri, 5 Jun 2020 08:50:47 +0200 Subject: [PATCH] remove --runtime root flag and make docker the default --- cmd/root.go | 4 +--- pkg/runtimes/runtime.go | 6 ++++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index 8173c561..9b805c2a 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -47,7 +47,6 @@ import ( type RootFlags struct { debugLogging bool version bool - runtime string } var flags = RootFlags{} @@ -87,7 +86,6 @@ func init() { // add persistent flags (present to all subcommands) // rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.k3d/config.yaml)") rootCmd.PersistentFlags().BoolVar(&flags.debugLogging, "verbose", false, "Enable verbose output (debug logging)") - rootCmd.PersistentFlags().StringVarP(&flags.runtime, "runtime", "r", "docker", "Choose a container runtime environment [docker, containerd]") // add local flags rootCmd.Flags().BoolVar(&flags.version, "version", false, "Show k3d and default k3s version") @@ -150,7 +148,7 @@ func initLogging() { } func initRuntime() { - runtime, err := runtimes.GetRuntime(flags.runtime) + runtime, err := runtimes.GetRuntime("docker") if err != nil { log.Fatalln(err) } diff --git a/pkg/runtimes/runtime.go b/pkg/runtimes/runtime.go index 4f56e7cc..23d3820d 100644 --- a/pkg/runtimes/runtime.go +++ b/pkg/runtimes/runtime.go @@ -35,6 +35,12 @@ import ( // SelectedRuntime is a runtime (pun intended) variable determining the selected runtime var SelectedRuntime Runtime = docker.Docker{} +// Docker docker +var Docker = docker.Docker{} + +// Containerd containerd +var Containerd = containerd.Containerd{} + // Runtimes defines a map of implemented k3d runtimes var Runtimes = map[string]Runtime{ "docker": docker.Docker{},