Add support for kubernetes in docker cli

- Add support for kubernetes for docker stack command
- Update to go 1.9
- Add kubernetes to vendors
- Print orchestrator in docker version command

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>

Author: vdemeester

circle.yml

@@ -37,6 +37,7 @@ jobs:
             docker build -f $dockerfile --tag cli-builder:$CIRCLE_BUILD_NUM .
             name=cross-$CIRCLE_BUILD_NUM-$CIRCLE_NODE_INDEX
             docker run \
+                -e VERSION=$VERSION \
                 -e CROSS_GROUP=$CIRCLE_NODE_INDEX \
                 --name $name cli-builder:$CIRCLE_BUILD_NUM \
                 make cross

cli/command/orchestrator/orchestrator.go

@@ -0,0 +1,53 @@
+package orchestrator
+
+import (
+	"os"
+	"strings"
+
+	"github.com/docker/cli/cli/command"
+	cliconfig "github.com/docker/cli/cli/config"
+)
+
+// Orchestrator type acts as an enum describing supported orchestrators.
+type Orchestrator string
+
+const (
+	// Kubernetes orchestrator
+	Kubernetes = Orchestrator("kubernetes")
+	// Swarm orchestrator
+	Swarm = Orchestrator("swarm")
+	unset = Orchestrator("unset")
+
+	defaultOrchestrator = Swarm
+	dockerOrchestrator  = "DOCKER_ORCHESTRATOR"
+)
+
+func normalize(flag string) Orchestrator {
+	switch strings.ToLower(flag) {
+	case "kubernetes", "k8s":
+		return Kubernetes
+	case "swarm", "swarmkit":
+		return Swarm
+	default:
+		return unset
+	}
+}
+
+// GetOrchestrator checks DOCKER_ORCHESTRATOR environment variable and configuration file
+// orchestrator value and returns user defined Orchestrator.
+func GetOrchestrator(dockerCli command.Cli) Orchestrator {
+	// Check environment variable
+	env := os.Getenv(dockerOrchestrator)
+	if o := normalize(env); o != unset {
+		return o
+	}
+	// Check config file
+	if configFile := cliconfig.LoadDefaultConfigFile(dockerCli.Err()); configFile != nil {
+		if o := normalize(configFile.Orchestrator); o != unset {
+			return o
+		}
+	}
+
+	// Nothing set, use default orchestrator
+	return defaultOrchestrator
+}

cli/command/stack/cmd.go

@@ -3,6 +3,9 @@ package stack
 import (
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
+	"github.com/docker/cli/cli/command/orchestrator"
+	"github.com/docker/cli/cli/command/stack/kubernetes"
+	"github.com/docker/cli/cli/command/stack/swarm"
 	"github.com/spf13/cobra"
 )
 
@@ -15,19 +18,24 @@ func NewStackCommand(dockerCli command.Cli) *cobra.Command {
 		RunE:        command.ShowHelp(dockerCli.Err()),
 		Annotations: map[string]string{"version": "1.25"},
 	}
-	cmd.AddCommand(
-		newDeployCommand(dockerCli),
-		newListCommand(dockerCli),
-		newRemoveCommand(dockerCli),
-		newServicesCommand(dockerCli),
-		newPsCommand(dockerCli),
-	)
+	switch orchestrator.GetOrchestrator(dockerCli) {
+	case orchestrator.Kubernetes:
+		kubernetes.AddStackCommands(cmd, dockerCli)
+	case orchestrator.Swarm:
+		swarm.AddStackCommands(cmd, dockerCli)
+	}
 	return cmd
 }
 
 // NewTopLevelDeployCommand returns a command for `docker deploy`
 func NewTopLevelDeployCommand(dockerCli command.Cli) *cobra.Command {
-	cmd := newDeployCommand(dockerCli)
+	var cmd *cobra.Command
+	switch orchestrator.GetOrchestrator(dockerCli) {
+	case orchestrator.Kubernetes:
+		cmd = kubernetes.NewTopLevelDeployCommand(dockerCli)
+	case orchestrator.Swarm:
+		cmd = swarm.NewTopLevelDeployCommand(dockerCli)
+	}
 	// Remove the aliases at the top level
 	cmd.Aliases = []string{}
 	cmd.Annotations = map[string]string{"experimental": "", "version": "1.25"}

cli/command/stack/opts.go cli/command/stack/common/opts.gocli/command/stack/opts.go renamed to cli/command/stack/common/opts.go

@@ -1,4 +1,4 @@
-package stack
+package common
 
 import (
 	"fmt"
@@ -10,21 +10,25 @@ import (
 	"github.com/spf13/pflag"
 )
 
-func addComposefileFlag(opt *string, flags *pflag.FlagSet) {
+// AddComposefileFlag adds compose-file file to the specified flagset
+func AddComposefileFlag(opt *string, flags *pflag.FlagSet) {
 	flags.StringVarP(opt, "compose-file", "c", "", "Path to a Compose file")
 	flags.SetAnnotation("compose-file", "version", []string{"1.25"})
 }
 
-func addBundlefileFlag(opt *string, flags *pflag.FlagSet) {
+// AddBundlefileFlag adds bundle-file file to the specified flagset
+func AddBundlefileFlag(opt *string, flags *pflag.FlagSet) {
 	flags.StringVar(opt, "bundle-file", "", "Path to a Distributed Application Bundle file")
 	flags.SetAnnotation("bundle-file", "experimental", nil)
 }
 
-func addRegistryAuthFlag(opt *bool, flags *pflag.FlagSet) {
+// AddRegistryAuthFlag adds with-registry-auth file to the specified flagset
+func AddRegistryAuthFlag(opt *bool, flags *pflag.FlagSet) {
 	flags.BoolVar(opt, "with-registry-auth", false, "Send registry authentication details to Swarm agents")
 }
 
-func loadBundlefile(stderr io.Writer, namespace string, path string) (*bundlefile.Bundlefile, error) {
+// LoadBundlefile loads a bundle-file from the specified path
+func LoadBundlefile(stderr io.Writer, namespace string, path string) (*bundlefile.Bundlefile, error) {
 	defaultPath := fmt.Sprintf("%s.dab", namespace)
 
 	if path == "" {

cli/command/stack/opts_test.go cli/command/stack/common/opts_test.gocli/command/stack/opts_test.go renamed to cli/command/stack/common/opts_test.go

@@ -1,4 +1,4 @@
-package stack
+package common
 
 import (
 	"bytes"
@@ -32,7 +32,7 @@ func TestLoadBundlefileErrors(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-		_, err := loadBundlefile(&bytes.Buffer{}, tc.namespace, tc.path)
+		_, err := LoadBundlefile(&bytes.Buffer{}, tc.namespace, tc.path)
 		assert.Error(t, err, tc.expectedError)
 	}
 }
@@ -42,7 +42,7 @@ func TestLoadBundlefile(t *testing.T) {
 
 	namespace := ""
 	path := filepath.Join("testdata", "bundlefile_with_two_services.dab")
-	bundleFile, err := loadBundlefile(buf, namespace, path)
+	bundleFile, err := LoadBundlefile(buf, namespace, path)
 
 	assert.NoError(t, err)
 	assert.Equal(t, len(bundleFile.Services), 2)

…estdata/bundlefile_with_two_services.dab …estdata/bundlefile_with_two_services.dabcli/command/stack/testdata/bundlefile_with_two_services.dab renamed to cli/command/stack/common/testdata/bundlefile_with_two_services.dab cli/command/stack/testdata/bundlefile_with_two_services.dab renamed to cli/command/stack/common/testdata/bundlefile_with_two_services.dab

@@ -0,0 +1,88 @@
+package clientset
+
+import (
+	composev1beta1 "github.com/docker/cli/cli/command/stack/kubernetes/api/client/clientset_generated/clientset/typed/compose/v1beta1"
+	glog "github.com/golang/glog"
+	discovery "k8s.io/client-go/discovery"
+	rest "k8s.io/client-go/rest"
+	flowcontrol "k8s.io/client-go/util/flowcontrol"
+)
+
+type Interface interface {
+	Discovery() discovery.DiscoveryInterface
+	ComposeV1beta1() composev1beta1.ComposeV1beta1Interface
+	// Deprecated: please explicitly pick a version if possible.
+	Compose() composev1beta1.ComposeV1beta1Interface
+}
+
+// Clientset contains the clients for groups. Each group has exactly one
+// version included in a Clientset.
+type Clientset struct {
+	*discovery.DiscoveryClient
+	*composev1beta1.ComposeV1beta1Client
+}
+
+// ComposeV1beta1 retrieves the ComposeV1beta1Client
+func (c *Clientset) ComposeV1beta1() composev1beta1.ComposeV1beta1Interface {
+	if c == nil {
+		return nil
+	}
+	return c.ComposeV1beta1Client
+}
+
+// Deprecated: Compose retrieves the default version of ComposeClient.
+// Please explicitly pick a version.
+func (c *Clientset) Compose() composev1beta1.ComposeV1beta1Interface {
+	if c == nil {
+		return nil
+	}
+	return c.ComposeV1beta1Client
+}
+
+// Discovery retrieves the DiscoveryClient
+func (c *Clientset) Discovery() discovery.DiscoveryInterface {
+	if c == nil {
+		return nil
+	}
+	return c.DiscoveryClient
+}
+
+// NewForConfig creates a new Clientset for the given config.
+func NewForConfig(c *rest.Config) (*Clientset, error) {
+	configShallowCopy := *c
+	if configShallowCopy.RateLimiter == nil && configShallowCopy.QPS > 0 {
+		configShallowCopy.RateLimiter = flowcontrol.NewTokenBucketRateLimiter(configShallowCopy.QPS, configShallowCopy.Burst)
+	}
+	var cs Clientset
+	var err error
+	cs.ComposeV1beta1Client, err = composev1beta1.NewForConfig(&configShallowCopy)
+	if err != nil {
+		return nil, err
+	}
+
+	cs.DiscoveryClient, err = discovery.NewDiscoveryClientForConfig(&configShallowCopy)
+	if err != nil {
+		glog.Errorf("failed to create the DiscoveryClient: %v", err)
+		return nil, err
+	}
+	return &cs, nil
+}
+
+// NewForConfigOrDie creates a new Clientset for the given config and
+// panics if there is an error in the config.
+func NewForConfigOrDie(c *rest.Config) *Clientset {
+	var cs Clientset
+	cs.ComposeV1beta1Client = composev1beta1.NewForConfigOrDie(c)
+
+	cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c)
+	return &cs
+}
+
+// New creates a new Clientset for the given RESTClient.
+func New(c rest.Interface) *Clientset {
+	var cs Clientset
+	cs.ComposeV1beta1Client = composev1beta1.New(c)
+
+	cs.DiscoveryClient = discovery.NewDiscoveryClient(c)
+	return &cs
+}

cli/command/stack/kubernetes/api/client/clientset_generated/clientset/clientset.go

@@ -0,0 +1,4 @@
+// This package is generated by client-gen with custom arguments.
+
+// This package has the automatically generated clientset.
+package clientset

cli/command/stack/kubernetes/api/client/clientset_generated/clientset/doc.go

@@ -0,0 +1,4 @@
+// This package is generated by client-gen with custom arguments.
+
+// This package contains the scheme of the automatically generated clientset.
+package scheme

cli/command/stack/kubernetes/api/client/clientset_generated/clientset/scheme/doc.go

@@ -0,0 +1,37 @@
+package scheme
+
+import (
+	composev1beta1 "github.com/docker/cli/cli/command/stack/kubernetes/api/compose/v1beta1"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	runtime "k8s.io/apimachinery/pkg/runtime"
+	schema "k8s.io/apimachinery/pkg/runtime/schema"
+	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
+)
+
+var Scheme = runtime.NewScheme()
+var Codecs = serializer.NewCodecFactory(Scheme)
+var ParameterCodec = runtime.NewParameterCodec(Scheme)
+
+func init() {
+	v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"})
+	AddToScheme(Scheme)
+}
+
+// AddToScheme adds all types of this clientset into the given scheme. This allows composition
+// of clientsets, like in:
+//
+//   import (
+//     "k8s.io/client-go/kubernetes"
+//     clientsetscheme "k8s.io/client-go/kuberentes/scheme"
+//     aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
+//   )
+//
+//   kclientset, _ := kubernetes.NewForConfig(c)
+//   aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
+//
+// After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
+// correctly.
+func AddToScheme(scheme *runtime.Scheme) {
+	composev1beta1.AddToScheme(scheme)
+
+}