Add a common interface between different Kubernetes Stack API version…

…s and use it in kubernetes stack commands * Add kubernetes Stack API v1beta2 client * Upgrade v1beta1 client to remove generated code Signed-off-by: Silvin Lubecki <[email protected]>
docker · Feb 26, 2018 · 38df84c · 38df84c
1 parent 854aad8
commit 38df84c
Show file tree

Hide file tree

Showing 92 changed files with 7,934 additions and 1,170 deletions.
diff --git a/cli/command/stack/kubernetes/cli.go b/cli/command/stack/kubernetes/cli.go
@@ -6,7 +6,6 @@ import (
 
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/kubernetes"
-	composev1beta1 "github.com/docker/cli/kubernetes/client/clientset_generated/clientset/typed/compose/v1beta1"
 	"github.com/docker/docker/pkg/homedir"
 	"github.com/pkg/errors"
 	flag "github.com/spf13/pflag"
@@ -77,20 +76,17 @@ func (c *KubeCli) composeClient() (*Factory, error) {
 	return NewFactory(c.kubeNamespace, c.kubeConfig)
 }
 
-func (c *KubeCli) stacks() (composev1beta1.StackInterface, error) {
+func (c *KubeCli) stacks() (stackClient, error) {
 	version, err := kubernetes.GetStackAPIVersion(c.clientSet)
-
 	if err != nil {
 		return nil, err
 	}
 
 	switch version {
 	case kubernetes.StackAPIV1Beta1:
-		clientSet, err := composev1beta1.NewForConfig(c.kubeConfig)
-		if err != nil {
-			return nil, err
-		}
-		return clientSet.Stacks(c.kubeNamespace), nil
+		return c.newStackV1Beta1()
+	case kubernetes.StackAPIV1Beta2:
+		return c.newStackV1Beta2()
 	default:
 		return nil, errors.Errorf("no supported Stack API version")
 	}

diff --git a/cli/command/stack/kubernetes/collision.go b/cli/command/stack/kubernetes/collision.go