Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

replace the imports in the cli to use compose-on-kubernetes 

Signed-off-by: Jérémie Drouet <jeremie.drouet@gmail.com>
This commit is contained in:
Jérémie Drouet 2018-12-20 08:45:35 +01:00
parent 8a634aa578
commit a6b0d1d174
11 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cli/command/stack/kubernetes/cli.go
View File

@ -7,8 +7,8 @@ import (
"os" "os"
"github.com/docker/cli/cli/command" "github.com/docker/cli/cli/command"
"github.com/docker/cli/kubernetes" kubernetes "github.com/docker/compose-on-kubernetes/api"
cliv1beta1 "github.com/docker/cli/kubernetes/client/clientset/typed/compose/v1beta1" cliv1beta1 "github.com/docker/compose-on-kubernetes/api/client/clientset/typed/compose/v1beta1"
"github.com/pkg/errors" "github.com/pkg/errors"
flag "github.com/spf13/pflag" flag "github.com/spf13/pflag"
kubeclient "k8s.io/client-go/kubernetes" kubeclient "k8s.io/client-go/kubernetes"

2
cli/command/stack/kubernetes/client.go
View File

@ -1,7 +1,7 @@
package kubernetes package kubernetes
import ( import (
"github.com/docker/cli/kubernetes" kubernetes "github.com/docker/compose-on-kubernetes/api"
"github.com/pkg/errors" "github.com/pkg/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kubeclient "k8s.io/client-go/kubernetes" kubeclient "k8s.io/client-go/kubernetes"

2
cli/command/stack/kubernetes/conversion.go
View File

@ -7,7 +7,7 @@ import (
"time" "time"
"github.com/docker/cli/cli/command/service" "github.com/docker/cli/cli/command/service"
"github.com/docker/cli/kubernetes/labels" "github.com/docker/compose-on-kubernetes/api/labels"
"github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/filters"
"github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/swarm"
appsv1beta2 "k8s.io/api/apps/v1beta2" appsv1beta2 "k8s.io/api/apps/v1beta2"

2
cli/command/stack/kubernetes/conversion_test.go
View File

@ -4,7 +4,7 @@ import (
"testing" "testing"
"github.com/docker/cli/cli/command/service" "github.com/docker/cli/cli/command/service"
"github.com/docker/cli/kubernetes/labels" "github.com/docker/compose-on-kubernetes/api/labels"
"github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/swarm"
"gotest.tools/assert" "gotest.tools/assert"
appsv1beta2 "k8s.io/api/apps/v1beta2" appsv1beta2 "k8s.io/api/apps/v1beta2"

4
cli/command/stack/kubernetes/convert.go
View File

@ -11,8 +11,8 @@ import (
"github.com/docker/cli/cli/compose/schema" "github.com/docker/cli/cli/compose/schema"
composeTypes "github.com/docker/cli/cli/compose/types" composeTypes "github.com/docker/cli/cli/compose/types"
composetypes "github.com/docker/cli/cli/compose/types" composetypes "github.com/docker/cli/cli/compose/types"
"github.com/docker/cli/kubernetes/compose/v1beta1" "github.com/docker/compose-on-kubernetes/api/compose/v1beta1"
"github.com/docker/cli/kubernetes/compose/v1beta2" "github.com/docker/compose-on-kubernetes/api/compose/v1beta2"
"github.com/pkg/errors" "github.com/pkg/errors"
yaml "gopkg.in/yaml.v2" yaml "gopkg.in/yaml.v2"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

2
cli/command/stack/kubernetes/services.go
View File

@ -7,7 +7,7 @@ import (
"github.com/docker/cli/cli/command/service" "github.com/docker/cli/cli/command/service"
"github.com/docker/cli/cli/command/stack/formatter" "github.com/docker/cli/cli/command/stack/formatter"
"github.com/docker/cli/cli/command/stack/options" "github.com/docker/cli/cli/command/stack/options"
"github.com/docker/cli/kubernetes/labels" "github.com/docker/compose-on-kubernetes/api/labels"
"github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/filters"
"github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/swarm"
appsv1beta2 "k8s.io/api/apps/v1beta2" appsv1beta2 "k8s.io/api/apps/v1beta2"

4
cli/command/stack/kubernetes/stack.go
View File

@ -5,8 +5,8 @@ import (
"path/filepath" "path/filepath"
"sort" "sort"
"github.com/docker/cli/kubernetes/compose/v1beta2" "github.com/docker/compose-on-kubernetes/api/compose/v1beta2"
"github.com/docker/cli/kubernetes/labels" "github.com/docker/compose-on-kubernetes/api/labels"
apiv1 "k8s.io/api/core/v1" apiv1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
corev1 "k8s.io/client-go/kubernetes/typed/core/v1" corev1 "k8s.io/client-go/kubernetes/typed/core/v1"

6
cli/command/stack/kubernetes/stackclient.go
View File

@ -3,9 +3,9 @@ package kubernetes
import ( import (
"fmt" "fmt"
composev1beta1 "github.com/docker/cli/kubernetes/client/clientset/typed/compose/v1beta1" composev1beta1 "github.com/docker/compose-on-kubernetes/api/client/clientset/typed/compose/v1beta1"
composev1beta2 "github.com/docker/cli/kubernetes/client/clientset/typed/compose/v1beta2" composev1beta2 "github.com/docker/compose-on-kubernetes/api/client/clientset/typed/compose/v1beta2"
"github.com/docker/cli/kubernetes/labels" "github.com/docker/compose-on-kubernetes/api/labels"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
corev1 "k8s.io/client-go/kubernetes/typed/core/v1" corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
"k8s.io/client-go/rest" "k8s.io/client-go/rest"

4
cli/command/stack/kubernetes/watcher.go
View File

@ -5,8 +5,8 @@ import (
"sync" "sync"
"time" "time"
apiv1beta1 "github.com/docker/cli/kubernetes/compose/v1beta1" apiv1beta1 "github.com/docker/compose-on-kubernetes/api/compose/v1beta1"
"github.com/docker/cli/kubernetes/labels" "github.com/docker/compose-on-kubernetes/api/labels"
"github.com/pkg/errors" "github.com/pkg/errors"
apiv1 "k8s.io/api/core/v1" apiv1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

4
cli/command/stack/kubernetes/watcher_test.go
View File

@ -3,8 +3,8 @@ package kubernetes
import ( import (
"testing" "testing"
apiv1beta1 "github.com/docker/cli/kubernetes/compose/v1beta1" apiv1beta1 "github.com/docker/compose-on-kubernetes/api/compose/v1beta1"
composelabels "github.com/docker/cli/kubernetes/labels" composelabels "github.com/docker/compose-on-kubernetes/api/labels"
"gotest.tools/assert" "gotest.tools/assert"
apiv1 "k8s.io/api/core/v1" apiv1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

2
cli/command/system/version.go
View File

@ -11,8 +11,8 @@ import (
"github.com/docker/cli/cli" "github.com/docker/cli/cli"
"github.com/docker/cli/cli/command" "github.com/docker/cli/cli/command"
"github.com/docker/cli/kubernetes"
"github.com/docker/cli/templates" "github.com/docker/cli/templates"
kubernetes "github.com/docker/compose-on-kubernetes/api"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"