Skip to content

Commit adf71a4

Browse files
silvin-lubeckisilvin-lubecki
authored
Merge pull request docker#1583 from jdrouet/compose-on-kube-sync
replace implementation by compose-on-kubernetes
2 parents 5d3906c + a6b0d1d commit adf71a4

File tree

115 files changed

+10250
-1483
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+10250
-1483
lines changed

‎cli/command/stack/kubernetes/cli.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"os"
88

99
"github.com/docker/cli/cli/command"
10-
"github.com/docker/cli/kubernetes"
11-
cliv1beta1 "github.com/docker/cli/kubernetes/client/clientset/typed/compose/v1beta1"
10+
kubernetes "github.com/docker/compose-on-kubernetes/api"
11+
cliv1beta1 "github.com/docker/compose-on-kubernetes/api/client/clientset/typed/compose/v1beta1"
1212
"github.com/pkg/errors"
1313
flag "github.com/spf13/pflag"
1414
kubeclient "k8s.io/client-go/kubernetes"

‎cli/command/stack/kubernetes/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package kubernetes
22

33
import (
4-
"github.com/docker/cli/kubernetes"
4+
kubernetes "github.com/docker/compose-on-kubernetes/api"
55
"github.com/pkg/errors"
66
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
77
kubeclient "k8s.io/client-go/kubernetes"

‎cli/command/stack/kubernetes/conversion.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"time"
88

99
"github.com/docker/cli/cli/command/service"
10-
"github.com/docker/cli/kubernetes/labels"
10+
"github.com/docker/compose-on-kubernetes/api/labels"
1111
"github.com/docker/docker/api/types/filters"
1212
"github.com/docker/docker/api/types/swarm"
1313
appsv1beta2 "k8s.io/api/apps/v1beta2"

‎cli/command/stack/kubernetes/conversion_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"testing"
55

66
"github.com/docker/cli/cli/command/service"
7-
"github.com/docker/cli/kubernetes/labels"
7+
"github.com/docker/compose-on-kubernetes/api/labels"
88
"github.com/docker/docker/api/types/swarm"
99
"gotest.tools/assert"
1010
appsv1beta2 "k8s.io/api/apps/v1beta2"

‎cli/command/stack/kubernetes/convert.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"github.com/docker/cli/cli/compose/schema"
1212
composeTypes "github.com/docker/cli/cli/compose/types"
1313
composetypes "github.com/docker/cli/cli/compose/types"
14-
"github.com/docker/cli/kubernetes/compose/v1beta1"
15-
"github.com/docker/cli/kubernetes/compose/v1beta2"
14+
"github.com/docker/compose-on-kubernetes/api/compose/v1beta1"
15+
"github.com/docker/compose-on-kubernetes/api/compose/v1beta2"
1616
"github.com/pkg/errors"
1717
yaml "gopkg.in/yaml.v2"
1818
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

‎cli/command/stack/kubernetes/services.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/docker/cli/cli/command/service"
88
"github.com/docker/cli/cli/command/stack/formatter"
99
"github.com/docker/cli/cli/command/stack/options"
10-
"github.com/docker/cli/kubernetes/labels"
10+
"github.com/docker/compose-on-kubernetes/api/labels"
1111
"github.com/docker/docker/api/types/filters"
1212
"github.com/docker/docker/api/types/swarm"
1313
appsv1beta2 "k8s.io/api/apps/v1beta2"

‎cli/command/stack/kubernetes/stack.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"path/filepath"
66
"sort"
77

8-
"github.com/docker/cli/kubernetes/compose/v1beta2"
9-
"github.com/docker/cli/kubernetes/labels"
8+
"github.com/docker/compose-on-kubernetes/api/compose/v1beta2"
9+
"github.com/docker/compose-on-kubernetes/api/labels"
1010
apiv1 "k8s.io/api/core/v1"
1111
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1212
corev1 "k8s.io/client-go/kubernetes/typed/core/v1"

‎cli/command/stack/kubernetes/stackclient.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package kubernetes
33
import (
44
"fmt"
55

6-
composev1beta1 "github.com/docker/cli/kubernetes/client/clientset/typed/compose/v1beta1"
7-
composev1beta2 "github.com/docker/cli/kubernetes/client/clientset/typed/compose/v1beta2"
8-
"github.com/docker/cli/kubernetes/labels"
6+
composev1beta1 "github.com/docker/compose-on-kubernetes/api/client/clientset/typed/compose/v1beta1"
7+
composev1beta2 "github.com/docker/compose-on-kubernetes/api/client/clientset/typed/compose/v1beta2"
8+
"github.com/docker/compose-on-kubernetes/api/labels"
99
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1010
corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
1111
"k8s.io/client-go/rest"

‎cli/command/stack/kubernetes/watcher.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"sync"
66
"time"
77

8-
apiv1beta1 "github.com/docker/cli/kubernetes/compose/v1beta1"
9-
"github.com/docker/cli/kubernetes/labels"
8+
apiv1beta1 "github.com/docker/compose-on-kubernetes/api/compose/v1beta1"
9+
"github.com/docker/compose-on-kubernetes/api/labels"
1010
"github.com/pkg/errors"
1111
apiv1 "k8s.io/api/core/v1"
1212
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

‎cli/command/stack/kubernetes/watcher_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package kubernetes
33
import (
44
"testing"
55

6-
apiv1beta1 "github.com/docker/cli/kubernetes/compose/v1beta1"
7-
composelabels "github.com/docker/cli/kubernetes/labels"
6+
apiv1beta1 "github.com/docker/compose-on-kubernetes/api/compose/v1beta1"
7+
composelabels "github.com/docker/compose-on-kubernetes/api/labels"
88
"gotest.tools/assert"
99
apiv1 "k8s.io/api/core/v1"
1010
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

0 commit comments

Comments
 (0)