Merge pull request #23 from dweomer/feature/9/kubectl-dropin

initial support for running as kubectl drop-in

go.mod

@@ -38,9 +38,11 @@ require (
 	github.com/containerd/console v1.0.1
 	github.com/containerd/containerd v1.4.3
 	github.com/containerd/typeurl v1.0.1
+	github.com/docker/cli v20.10.0-beta1.0.20201029214301-1d20b15adc38+incompatible
 	github.com/docker/distribution v2.7.1+incompatible
 	github.com/docker/docker-credential-helpers v0.6.3
 	github.com/docker/go-units v0.4.0
+	github.com/fvbommel/sortorder v1.0.2 // indirect
 	github.com/gogo/googleapis v1.3.2
 	github.com/gogo/protobuf v1.3.2
 	github.com/golang/protobuf v1.4.3
@@ -51,6 +53,7 @@ require (
 	github.com/rancher/wrangler-cli v0.0.0-20210209192715-4335f41916a5
 	github.com/sirupsen/logrus v1.7.0
 	github.com/spf13/cobra v1.1.1
+	github.com/theupdateframework/notary v0.7.0 // indirect
 	golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
 	google.golang.org/grpc v1.29.1
 	k8s.io/api v0.19.0

main.go

@@ -3,6 +3,9 @@
 package main
 
 import (
+	"os"
+	"path/filepath"
+
 	"github.com/containerd/containerd/pkg/seed"
 	"github.com/rancher/kim/pkg/cli"
 	command "github.com/rancher/wrangler-cli"
@@ -16,5 +19,12 @@ func init() {
 }
 
 func main() {
-	command.Main(cli.Main())
+	switch _, exe := filepath.Split(os.Args[0]); exe {
+	case "kubectl-builder":
+		command.Main(cli.Builder(exe))
+	case "kubectl-image":
+		command.Main(cli.Image(exe))
+	default:
+		command.Main(cli.Main())
+	}
 }

pkg/cli/cli.go

@@ -1,17 +1,18 @@
 package cli
 
 import (
+	"fmt"
 	"strings"
 
 	"github.com/rancher/kim/pkg/cli/command/agent"
+	"github.com/rancher/kim/pkg/cli/command/builder"
 	"github.com/rancher/kim/pkg/cli/command/image"
 	"github.com/rancher/kim/pkg/cli/command/image/build"
 	"github.com/rancher/kim/pkg/cli/command/image/list"
 	"github.com/rancher/kim/pkg/cli/command/image/pull"
 	"github.com/rancher/kim/pkg/cli/command/image/push"
 	"github.com/rancher/kim/pkg/cli/command/image/remove"
 	"github.com/rancher/kim/pkg/cli/command/image/tag"
-	"github.com/rancher/kim/pkg/cli/command/system"
 	"github.com/rancher/kim/pkg/client"
 	"github.com/rancher/kim/pkg/credential/provider"
 	"github.com/rancher/kim/pkg/version"
@@ -55,7 +56,7 @@ var (
 )
 
 func Main() *cobra.Command {
-	cmd := wrangler.Command(&App{}, cobra.Command{
+	app := wrangler.Command(&App{}, cobra.Command{
 		Use:                   "kim [OPTIONS] COMMAND",
 		Short:                 "Kubernetes Image Manager -- in ur kubernetes buildin ur imagez",
 		Version:               version.FriendlyVersion(),
@@ -65,20 +66,42 @@ func Main() *cobra.Command {
 			"shortcuts": "image",
 		},
 	})
-	cmd.AddCommand(
+	app.SetUsageTemplate(defaultUsageTemplate)
+	app.AddCommand(
 		agent.Command(),
 		image.Command(),
-		system.Command(),
+		builder.Command(),
 	)
 	// image subsystem shortcuts
-	AddShortcut(cmd, build.Use, "image", "build")
-	AddShortcut(cmd, list.Use("images"), "image", "list")
-	AddShortcut(cmd, pull.Use, "image", "pull")
-	AddShortcut(cmd, push.Use, "image", "push")
-	AddShortcut(cmd, remove.Use("rmi"), "image", "remove")
-	AddShortcut(cmd, tag.Use, "image", "tag")
-	cmd.SetUsageTemplate(defaultUsageTemplate)
-	return cmd
+	AddShortcut(app, build.Use, "image", "build")
+	AddShortcut(app, list.Use("images"), "image", "list")
+	AddShortcut(app, pull.Use, "image", "pull")
+	AddShortcut(app, push.Use, "image", "push")
+	AddShortcut(app, remove.Use("rmi"), "image", "remove")
+	AddShortcut(app, tag.Use, "image", "tag")
+	return app
+}
+
+func Image(exe string) *cobra.Command {
+	cmd := image.Command()
+	app := wrangler.Command(&App{}, *cmd)
+	app.SetUsageTemplate(defaultUsageTemplate)
+	app.Use = image.Use(exe)
+	app.Version = version.FriendlyVersion()
+	app.Example = fmt.Sprintf("%s build --tag your/image:tag .", strings.Replace(exe, "kubectl-", "kubectl ", 1))
+	cmd.PersistentFlags().AddFlagSet(app.PersistentFlags())
+	return app
+}
+
+func Builder(exe string) *cobra.Command {
+	cmd := builder.Command()
+	app := wrangler.Command(&App{}, *cmd)
+	app.SetUsageTemplate(defaultUsageTemplate)
+	app.Use = builder.Use(exe)
+	app.Version = version.FriendlyVersion()
+	app.Example = fmt.Sprintf("%s install --selector k3s.io/hostname=my-builder", strings.Replace(exe, "kubectl-", "kubectl ", 1))
+	cmd.PersistentFlags().AddFlagSet(app.PersistentFlags())
+	return app
 }
 
 func AddShortcut(cmd *cobra.Command, use string, path ...string) {
@@ -94,7 +117,7 @@ func AddShortcut(cmd *cobra.Command, use string, path ...string) {
 	shortcut.Annotations = map[string]string{
 		"shortcut-root": path[0],
 	}
-	for pre := sub; ; pre = pre.Parent() {
+	for pre := sub; pre != nil; pre = pre.Parent() {
 		if pre.Name() == path[0] {
 			if pre.PersistentPreRunE != nil {
 				shortcut.PersistentPreRunE = func(alias *cobra.Command, args []string) error {

pkg/cli/command/system/system.go → pkg/cli/command/builder/builder.go

@@ -1,21 +1,29 @@
-package system
+package builder
 
 import (
-	"github.com/rancher/kim/pkg/cli/command/system/info"
-	"github.com/rancher/kim/pkg/cli/command/system/install"
-	"github.com/rancher/kim/pkg/cli/command/system/uninstall"
+	"fmt"
+
+	"github.com/rancher/kim/pkg/cli/command/builder/install"
+	"github.com/rancher/kim/pkg/cli/command/builder/uninstall"
 	wrangler "github.com/rancher/wrangler-cli"
 	"github.com/spf13/cobra"
 )
 
+const (
+	Short = "Manage Builder(s)"
+)
+
+func Use(sub string) string {
+	return fmt.Sprintf("%s [OPTIONS] COMMAND", sub)
+}
+
 func Command() *cobra.Command {
 	cmd := wrangler.Command(&CommandSpec{}, cobra.Command{
-		Use:                   "system [OPTIONS] COMMAND",
-		Short:                 "Manage KIM",
+		Use:                   Use("builder"),
+		Short:                 Short,
 		DisableFlagsInUseLine: true,
 	})
 	cmd.AddCommand(
-		info.Command(),
 		install.Command(),
 		uninstall.Command(),
 	)

pkg/cli/command/system/install/install.go → pkg/cli/command/builder/install/install.go

@@ -2,7 +2,7 @@ package install
 
 import (
 	"github.com/rancher/kim/pkg/client"
-	"github.com/rancher/kim/pkg/client/system/builder"
+	"github.com/rancher/kim/pkg/client/builder"
 	wrangler "github.com/rancher/wrangler-cli"
 	"github.com/spf13/cobra"
 )

pkg/cli/command/system/uninstall/uninstall.go → pkg/cli/command/builder/uninstall/uninstall.go

@@ -2,7 +2,7 @@ package uninstall
 
 import (
 	"github.com/rancher/kim/pkg/client"
-	"github.com/rancher/kim/pkg/client/system/builder"
+	"github.com/rancher/kim/pkg/client/builder"
 	wrangler "github.com/rancher/wrangler-cli"
 	"github.com/spf13/cobra"
 )

pkg/cli/command/image/build/build.go

@@ -1,7 +1,6 @@
 package build
 
 import (
-	"errors"
 	"os"
 
 	"github.com/rancher/kim/pkg/client"
@@ -20,6 +19,7 @@ func Command() *cobra.Command {
 		Use:                   Use,
 		Short:                 Short,
 		DisableFlagsInUseLine: true,
+		Args:                  cobra.ExactArgs(1),
 	})
 }
 
@@ -28,10 +28,6 @@ type CommandSpec struct {
 }
 
 func (c *CommandSpec) Run(cmd *cobra.Command, args []string) error {
-	if len(args) != 1 {
-		return errors.New("exactly one argument is required")
-	}
-
 	k8s, err := client.DefaultConfig.Interface()
 	if err != nil {
 		return err

pkg/cli/command/image/image.go

@@ -1,24 +1,34 @@
 package image
 
 import (
+	"fmt"
+
+	"github.com/rancher/kim/pkg/cli/command/builder/install"
 	"github.com/rancher/kim/pkg/cli/command/image/build"
 	"github.com/rancher/kim/pkg/cli/command/image/list"
 	"github.com/rancher/kim/pkg/cli/command/image/pull"
 	"github.com/rancher/kim/pkg/cli/command/image/push"
 	"github.com/rancher/kim/pkg/cli/command/image/remove"
 	"github.com/rancher/kim/pkg/cli/command/image/tag"
-	"github.com/rancher/kim/pkg/cli/command/system/install"
 	"github.com/rancher/kim/pkg/client"
 	wrangler "github.com/rancher/wrangler-cli"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
+const (
+	Short = "Manage Images"
+)
+
+func Use(sub string) string {
+	return fmt.Sprintf("%s [OPTIONS] COMMAND", sub)
+}
+
 func Command() *cobra.Command {
 	cmd := wrangler.Command(&CommandSpec{}, cobra.Command{
-		Use:                   "image [OPTIONS] COMMAND",
-		Short:                 "Manage Images",
+		Use:                   Use("image"),
+		Short:                 Short,
 		DisableFlagsInUseLine: true,
 		//TraverseChildren:      true,
 	})

pkg/cli/command/image/list/list.go

@@ -35,6 +35,5 @@ func (s *CommandSpec) Run(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-
 	return s.List.Do(cmd.Context(), k8s, args)
 }

pkg/cli/command/image/pull/pull.go

@@ -1,7 +1,6 @@
 package pull
 
 import (
-	"github.com/pkg/errors"
 	"github.com/rancher/kim/pkg/client"
 	"github.com/rancher/kim/pkg/client/image"
 	wrangler "github.com/rancher/wrangler-cli"
@@ -18,6 +17,7 @@ func Command() *cobra.Command {
 		Use:                   Use,
 		Short:                 Short,
 		DisableFlagsInUseLine: true,
+		Args:                  cobra.ExactArgs(1),
 	})
 }
 
@@ -26,10 +26,6 @@ type CommandSpec struct {
 }
 
 func (s *CommandSpec) Run(cmd *cobra.Command, args []string) error {
-	if len(args) != 1 {
-		return errors.New("exactly one argument is required")
-	}
-
 	k8s, err := client.DefaultConfig.Interface()
 	if err != nil {
 		return err

pkg/cli/command/image/push/push.go

@@ -1,7 +1,6 @@
 package push
 
 import (
-	"github.com/pkg/errors"
 	"github.com/rancher/kim/pkg/client"
 	"github.com/rancher/kim/pkg/client/image"
 	wrangler "github.com/rancher/wrangler-cli"
@@ -18,6 +17,7 @@ func Command() *cobra.Command {
 		Use:                   Use,
 		Short:                 Short,
 		DisableFlagsInUseLine: true,
+		Args:                  cobra.ExactArgs(1),
 	})
 }
 
@@ -26,10 +26,6 @@ type CommandSpec struct {
 }
 
 func (s *CommandSpec) Run(cmd *cobra.Command, args []string) error {
-	if len(args) != 1 {
-		return errors.New("exactly one argument is required")
-	}
-
 	k8s, err := client.DefaultConfig.Interface()
 	if err != nil {
 		return err

pkg/cli/command/image/remove/remove.go

@@ -3,7 +3,6 @@ package remove
 import (
 	"fmt"
 
-	"github.com/pkg/errors"
 	"github.com/rancher/kim/pkg/client"
 	"github.com/rancher/kim/pkg/client/image"
 	wrangler "github.com/rancher/wrangler-cli"
@@ -24,6 +23,7 @@ func Command() *cobra.Command {
 		Short:                 Short,
 		Aliases:               []string{"remove"},
 		DisableFlagsInUseLine: true,
+		Args:                  cobra.MinimumNArgs(1),
 	})
 }
 
@@ -32,10 +32,6 @@ type CommandSpec struct {
 }
 
 func (c *CommandSpec) Run(cmd *cobra.Command, args []string) error {
-	if len(args) != 1 {
-		return errors.New("exactly one argument is required")
-	}
-
 	k8s, err := client.DefaultConfig.Interface()
 	if err != nil {
 		return err

pkg/cli/command/image/tag/tag.go

@@ -1,7 +1,6 @@
 package tag
 
 import (
-	"github.com/pkg/errors"
 	"github.com/rancher/kim/pkg/client"
 	"github.com/rancher/kim/pkg/client/image"
 	wrangler "github.com/rancher/wrangler-cli"
@@ -18,6 +17,7 @@ func Command() *cobra.Command {
 		Use:                   Use,
 		Short:                 Short,
 		DisableFlagsInUseLine: true,
+		Args:                  cobra.MinimumNArgs(2),
 	})
 }
 
@@ -26,10 +26,6 @@ type CommandSpec struct {
 }
 
 func (c *CommandSpec) Run(cmd *cobra.Command, args []string) error {
-	if len(args) < 2 {
-		return errors.New("at least two arguments are required")
-	}
-
 	k8s, err := client.DefaultConfig.Interface()
 	if err != nil {
 		return err