Move /cli/command/stack/kubernetes/api to /kubernetes

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

cli/command/stack/kubernetes/check.go

@@ -3,7 +3,7 @@ package kubernetes
 import (
 	"fmt"
 
-	apiv1beta1 "github.com/docker/cli/cli/command/stack/kubernetes/api/compose/v1beta1"
+	apiv1beta1 "github.com/docker/cli/kubernetes/compose/v1beta1"
 	log "github.com/sirupsen/logrus"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"

cli/command/stack/kubernetes/cmd.go

@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 
 	"github.com/docker/cli/cli/command"
-	composev1beta1 "github.com/docker/cli/cli/command/stack/kubernetes/api/client/clientset_generated/clientset/typed/compose/v1beta1"
+	composev1beta1 "github.com/docker/cli/kubernetes/client/clientset_generated/clientset/typed/compose/v1beta1"
 	"github.com/docker/docker/pkg/homedir"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"

cli/command/stack/kubernetes/collision.go

@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"sort"
 
-	apiv1beta1 "github.com/docker/cli/cli/command/stack/kubernetes/api/compose/v1beta1"
-	"github.com/docker/cli/cli/command/stack/kubernetes/api/labels"
 	"github.com/docker/cli/cli/compose/loader"
 	"github.com/docker/cli/cli/compose/types"
+	apiv1beta1 "github.com/docker/cli/kubernetes/compose/v1beta1"
+	"github.com/docker/cli/kubernetes/labels"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
 )

cli/command/stack/kubernetes/conversion.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/docker/cli/cli/command/formatter"
-	"github.com/docker/cli/cli/command/stack/kubernetes/api/labels"
+	"github.com/docker/cli/kubernetes/labels"
 	"github.com/docker/docker/api/types/swarm"
 	appsv1beta2 "k8s.io/api/apps/v1beta2"
 	apiv1 "k8s.io/api/core/v1"

cli/command/stack/kubernetes/convert.go

@@ -1,7 +1,7 @@
 package kubernetes
 
 import (
-	"github.com/docker/cli/cli/command/stack/kubernetes/api/labels"
+	"github.com/docker/cli/kubernetes/labels"
 	apiv1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

cli/command/stack/kubernetes/loader.go

@@ -7,10 +7,10 @@ import (
 	"path/filepath"
 	"strings"
 
-	apiv1beta1 "github.com/docker/cli/cli/command/stack/kubernetes/api/compose/v1beta1"
 	"github.com/docker/cli/cli/compose/loader"
 	"github.com/docker/cli/cli/compose/template"
 	composetypes "github.com/docker/cli/cli/compose/types"
+	apiv1beta1 "github.com/docker/cli/kubernetes/compose/v1beta1"
 	"github.com/pkg/errors"
 	yaml "gopkg.in/yaml.v2"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

cli/command/stack/kubernetes/services.go

@@ -6,7 +6,7 @@ import (
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/formatter"
-	"github.com/docker/cli/cli/command/stack/kubernetes/api/labels"
+	"github.com/docker/cli/kubernetes/labels"
 	"github.com/spf13/cobra"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

cli/command/stack/kubernetes/watcher.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
-	apiv1beta1 "github.com/docker/cli/cli/command/stack/kubernetes/api/compose/v1beta1"
+	apiv1beta1 "github.com/docker/cli/kubernetes/compose/v1beta1"
-	"github.com/docker/cli/cli/command/stack/kubernetes/api/labels"
+	"github.com/docker/cli/kubernetes/labels"
 	apiv1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	corev1 "k8s.io/client-go/kubernetes/typed/core/v1"

kubernetes/client/clientset_generated/clientset/clientset.go

@@ -1,7 +1,7 @@
 package clientset
 
 import (
-	composev1beta1 "github.com/docker/cli/cli/command/stack/kubernetes/api/client/clientset_generated/clientset/typed/compose/v1beta1"
+	composev1beta1 "github.com/docker/cli/kubernetes/client/clientset_generated/clientset/typed/compose/v1beta1"
 	glog "github.com/golang/glog"
 	discovery "k8s.io/client-go/discovery"
 	rest "k8s.io/client-go/rest"

kubernetes/client/clientset_generated/clientset/scheme/register.go

@@ -1,7 +1,7 @@
 package scheme
 
 import (
-	composev1beta1 "github.com/docker/cli/cli/command/stack/kubernetes/api/compose/v1beta1"
+	composev1beta1 "github.com/docker/cli/kubernetes/compose/v1beta1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"

kubernetes/client/clientset_generated/clientset/typed/compose/v1beta1/compose_client.go

@@ -1,8 +1,8 @@
 package v1beta1
 
 import (
-	"github.com/docker/cli/cli/command/stack/kubernetes/api/client/clientset_generated/clientset/scheme"
+	"github.com/docker/cli/kubernetes/client/clientset_generated/clientset/scheme"
-	v1beta1 "github.com/docker/cli/cli/command/stack/kubernetes/api/compose/v1beta1"
+	v1beta1 "github.com/docker/cli/kubernetes/compose/v1beta1"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	rest "k8s.io/client-go/rest"
 )

kubernetes/client/clientset_generated/clientset/typed/compose/v1beta1/stack.go

@@ -1,8 +1,8 @@
 package v1beta1
 
 import (
-	scheme "github.com/docker/cli/cli/command/stack/kubernetes/api/client/clientset_generated/clientset/scheme"
+	scheme "github.com/docker/cli/kubernetes/client/clientset_generated/clientset/scheme"
-	v1beta1 "github.com/docker/cli/cli/command/stack/kubernetes/api/compose/v1beta1"
+	v1beta1 "github.com/docker/cli/kubernetes/compose/v1beta1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"

kubernetes/compose/v1beta1/doc.go

@@ -5,7 +5,7 @@
 //
 // +k8s:openapi-gen=true
 // +k8s:deepcopy-gen=package,register
-// +k8s:conversion-gen=github.com/docker/cli/cli/command/stack/kubernetes/api/compose
+// +k8s:conversion-gen=github.com/docker/cli/kubernetes/compose
 // +k8s:defaulter-gen=TypeMeta
 // +groupName=compose.docker.com
-package v1beta1 // import "github.com/docker/cli/cli/command/stack/kubernetes/api/compose/v1beta1"
+package v1beta1 // import "github.com/docker/cli/kubernetes/compose/v1beta1"

kubernetes/compose/v1beta1/owner_stack_types.go

@@ -3,7 +3,7 @@ package v1beta1
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/docker/cli/cli/command/stack/kubernetes/api/compose"
+	"github.com/docker/cli/kubernetes/compose"
 )
 
 // Owner defines the owner of a stack. It is used to impersonate the controller calls

kubernetes/compose/v1beta1/zz_generated.conversion.go

@@ -5,7 +5,7 @@
 package v1beta1
 
 import (
-	compose "github.com/docker/cli/cli/command/stack/kubernetes/api/compose"
+	compose "github.com/docker/cli/kubernetes/compose"
 	conversion "k8s.io/apimachinery/pkg/conversion"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 )
@@ -53,7 +53,6 @@ func Convert_compose_Owner_To_v1beta1_Owner(in *compose.Owner, out *Owner, s con
 	return autoConvert_compose_Owner_To_v1beta1_Owner(in, out, s)
 }
 
-
 func autoConvert_v1beta1_Stack_To_compose_Stack(in *Stack, out *compose.Stack, s conversion.Scope) error {
 	out.ObjectMeta = in.ObjectMeta
 	if err := Convert_v1beta1_StackSpec_To_compose_StackSpec(&in.Spec, &out.Spec, s); err != nil {
@@ -136,6 +135,7 @@ func autoConvert_v1beta1_StackSpec_To_compose_StackSpec(in *StackSpec, out *comp
 func Convert_compose_StackSpec_To_v1beta1_StackSpec(in *compose.StackSpec, out *StackSpec, s conversion.Scope) error {
 	return autoConvert_compose_StackSpec_To_v1beta1_StackSpec(in, out, s)
 }
+
 // Convert_v1beta1_StackSpec_To_compose_StackSpec is an autogenerated conversion function.
 func Convert_v1beta1_StackSpec_To_compose_StackSpec(in *StackSpec, out *compose.StackSpec, s conversion.Scope) error {
 	return autoConvert_v1beta1_StackSpec_To_compose_StackSpec(in, out, s)

kubernetes/doc.go

@@ -1,4 +1,4 @@
 //
 // +domain=docker.com
 
-package apis
+package kubernetes