Merge pull request #1147 from allencloud/refactor

refactor: move pkg to correct places
AliyunContainerService · Apr 17, 2018 · 81e56b3 · 81e56b3
2 parents dc75691 + 5074547
commit 81e56b3
Show file tree

Hide file tree

Showing 74 changed files with 45 additions and 45 deletions.
diff --git a/Makefile b/Makefile
@@ -72,9 +72,9 @@ validate-swagger: ## run swagger validate
 .PHONY: modules
 modules:
 	@./hack/module --clean
-	@./hack/module --add-volume=github.com/alibaba/pouch/volume/modules/ceph
-	@./hack/module --add-volume=github.com/alibaba/pouch/volume/modules/tmpfs
-	@./hack/module --add-volume=github.com/alibaba/pouch/volume/modules/local
+	@./hack/module --add-volume=github.com/alibaba/pouch/storage/volume/modules/ceph
+	@./hack/module --add-volume=github.com/alibaba/pouch/storage/volume/modules/tmpfs
+	@./hack/module --add-volume=github.com/alibaba/pouch/storage/volume/modules/local
 
 # build binaries
 # install them to /usr/local/bin/

diff --git a/pkg/opts/cpu.go → apis/opts/cpu.go b/pkg/opts/cpu.go → apis/opts/cpu.go
diff --git a/pkg/opts/devicemappings.go → apis/opts/devicemappings.go b/pkg/opts/devicemappings.go → apis/opts/devicemappings.go
diff --git a/pkg/opts/devicemappings_test.go → apis/opts/devicemappings_test.go b/pkg/opts/devicemappings_test.go → apis/opts/devicemappings_test.go
diff --git a/pkg/opts/diskquota.go → apis/opts/diskquota.go b/pkg/opts/diskquota.go → apis/opts/diskquota.go
diff --git a/pkg/opts/diskquota_test.go → apis/opts/diskquota_test.go b/pkg/opts/diskquota_test.go → apis/opts/diskquota_test.go
diff --git a/pkg/opts/intel_rdt.go → apis/opts/intel_rdt.go b/pkg/opts/intel_rdt.go → apis/opts/intel_rdt.go
diff --git a/pkg/opts/intel_rdt_test.go → apis/opts/intel_rdt_test.go b/pkg/opts/intel_rdt_test.go → apis/opts/intel_rdt_test.go
diff --git a/pkg/opts/labels.go → apis/opts/labels.go b/pkg/opts/labels.go → apis/opts/labels.go
diff --git a/pkg/opts/labels_test.go → apis/opts/labels_test.go b/pkg/opts/labels_test.go → apis/opts/labels_test.go
diff --git a/pkg/opts/memory.go → apis/opts/memory.go b/pkg/opts/memory.go → apis/opts/memory.go
diff --git a/pkg/opts/memory_swap.go → apis/opts/memory_swap.go b/pkg/opts/memory_swap.go → apis/opts/memory_swap.go
diff --git a/pkg/opts/memory_swap_test.go → apis/opts/memory_swap_test.go b/pkg/opts/memory_swap_test.go → apis/opts/memory_swap_test.go
diff --git a/pkg/opts/memory_swappiness.go → apis/opts/memory_swappiness.go b/pkg/opts/memory_swappiness.go → apis/opts/memory_swappiness.go
diff --git a/pkg/opts/memory_swappiness_test.go → apis/opts/memory_swappiness_test.go b/pkg/opts/memory_swappiness_test.go → apis/opts/memory_swappiness_test.go
diff --git a/pkg/opts/memory_test.go → apis/opts/memory_test.go b/pkg/opts/memory_test.go → apis/opts/memory_test.go
diff --git a/pkg/opts/mountpoint.go → apis/opts/mountpoint.go b/pkg/opts/mountpoint.go → apis/opts/mountpoint.go
diff --git a/pkg/opts/mountpoint_test.go → apis/opts/mountpoint_test.go b/pkg/opts/mountpoint_test.go → apis/opts/mountpoint_test.go
diff --git a/pkg/opts/networks.go → apis/opts/networks.go b/pkg/opts/networks.go → apis/opts/networks.go
diff --git a/pkg/opts/networks_test.go → apis/opts/networks_test.go b/pkg/opts/networks_test.go → apis/opts/networks_test.go
diff --git a/pkg/opts/oom_score.go → apis/opts/oom_score.go b/pkg/opts/oom_score.go → apis/opts/oom_score.go
diff --git a/pkg/opts/portbindings.go → apis/opts/portbindings.go b/pkg/opts/portbindings.go → apis/opts/portbindings.go
diff --git a/pkg/opts/portbindings_test.go → apis/opts/portbindings_test.go b/pkg/opts/portbindings_test.go → apis/opts/portbindings_test.go
diff --git a/pkg/opts/ports.go → apis/opts/ports.go b/pkg/opts/ports.go → apis/opts/ports.go
diff --git a/pkg/opts/ports_test.go → apis/opts/ports_test.go b/pkg/opts/ports_test.go → apis/opts/ports_test.go
diff --git a/pkg/opts/restart_policy.go → apis/opts/restart_policy.go b/pkg/opts/restart_policy.go → apis/opts/restart_policy.go
diff --git a/pkg/opts/restart_policy_test.go → apis/opts/restart_policy_test.go b/pkg/opts/restart_policy_test.go → apis/opts/restart_policy_test.go
diff --git a/pkg/opts/spec_annotation.go → apis/opts/spec_annotation.go b/pkg/opts/spec_annotation.go → apis/opts/spec_annotation.go
diff --git a/pkg/opts/spec_annotation_test.go → apis/opts/spec_annotation_test.go b/pkg/opts/spec_annotation_test.go → apis/opts/spec_annotation_test.go
diff --git a/pkg/opts/sysctl.go → apis/opts/sysctl.go b/pkg/opts/sysctl.go → apis/opts/sysctl.go
diff --git a/pkg/opts/sysctl_test.go → apis/opts/sysctl_test.go b/pkg/opts/sysctl_test.go → apis/opts/sysctl_test.go
diff --git a/cli/container.go b/cli/container.go
@@ -3,8 +3,8 @@ package main
 import (
 	"strings"
 
+	"github.com/alibaba/pouch/apis/opts"
 	"github.com/alibaba/pouch/apis/types"
-	"github.com/alibaba/pouch/pkg/opts"
 
 	strfmt "github.com/go-openapi/strfmt"
 )

diff --git a/cli/update.go b/cli/update.go
@@ -3,8 +3,8 @@ package main
 import (
 	"context"
 
+	"github.com/alibaba/pouch/apis/opts"
 	"github.com/alibaba/pouch/apis/types"
-	"github.com/alibaba/pouch/pkg/opts"
 	"github.com/alibaba/pouch/pkg/reference"
 
 	"github.com/spf13/cobra"

diff --git a/daemon/config/config.go b/daemon/config/config.go
@@ -9,7 +9,7 @@ import (
 	"github.com/alibaba/pouch/cri"
 	"github.com/alibaba/pouch/network"
 	"github.com/alibaba/pouch/pkg/utils"
-	"github.com/alibaba/pouch/volume"
+	"github.com/alibaba/pouch/storage/volume"
 )
 
 // Config refers to daemon's whole configurations.

diff --git a/daemon/mgr/container.go b/daemon/mgr/container.go
@@ -12,6 +12,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/alibaba/pouch/apis/opts"
 	"github.com/alibaba/pouch/apis/plugins"
 	"github.com/alibaba/pouch/apis/types"
 	"github.com/alibaba/pouch/ctrd"
@@ -22,11 +23,10 @@ import (
 	"github.com/alibaba/pouch/pkg/collect"
 	"github.com/alibaba/pouch/pkg/errtypes"
 	"github.com/alibaba/pouch/pkg/meta"
-	"github.com/alibaba/pouch/pkg/opts"
-	"github.com/alibaba/pouch/pkg/quota"
 	"github.com/alibaba/pouch/pkg/randomid"
 	"github.com/alibaba/pouch/pkg/reference"
 	"github.com/alibaba/pouch/pkg/utils"
+	"github.com/alibaba/pouch/storage/quota"
 
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/namespaces"

diff --git a/daemon/mgr/spec_blkio.go b/daemon/mgr/spec_blkio.go
@@ -8,7 +8,7 @@ import (
 	"syscall"
 
 	"github.com/alibaba/pouch/apis/types"
-	"github.com/alibaba/pouch/pkg/quota"
+	"github.com/alibaba/pouch/storage/quota"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 )
 

diff --git a/daemon/mgr/spec_devices.go b/daemon/mgr/spec_devices.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/alibaba/pouch/pkg/opts"
+	"github.com/alibaba/pouch/apis/opts"
 
 	"github.com/opencontainers/runc/libcontainer/configs"
 	"github.com/opencontainers/runc/libcontainer/devices"

diff --git a/daemon/mgr/volume.go b/daemon/mgr/volume.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 
 	"github.com/alibaba/pouch/pkg/errtypes"
-	"github.com/alibaba/pouch/volume"
-	"github.com/alibaba/pouch/volume/types"
+	"github.com/alibaba/pouch/storage/volume"
+	"github.com/alibaba/pouch/storage/volume/types"
 
 	"github.com/pkg/errors"
 )

diff --git a/hack/module b/hack/module
@@ -68,8 +68,8 @@ if [ "$help" = "yes" ]; then
     echo ""
     echo "     ./module            To comiple directly on current codes, include added modules"
     echo ""
-    echo "     ./module --add-volume=github.com/alibaba/pouch/volume/examples/demo"
-    echo "     A example show how to add a driver module, 'github.com/alibaba/pouch/volume/examples/demo' is a Go's package"
+    echo "     ./module --add-volume=github.com/alibaba/pouch/storage/volume/examples/demo"
+    echo "     A example show how to add a driver module, 'github.com/alibaba/pouch/storage/volume/examples/demo' is a Go's package"
     echo "     can be found in \$GOPATH"
     exit 0
 fi
diff --git a/hack/package/deb/Makefile b/hack/package/deb/Makefile
@@ -38,9 +38,9 @@ clean:
 
 #.PHONY: modules
 modules:
-	@./hack/module --add-volume=github.com/alibaba/pouch/volume/modules/ceph
-	@./hack/module --add-volume=github.com/alibaba/pouch/volume/modules/tmpfs
-	@./hack/module --add-volume=github.com/alibaba/pouch/volume/modules/local
+	@./hack/module --add-volume=github.com/alibaba/pouch/storage/volume/modules/ceph
+	@./hack/module --add-volume=github.com/alibaba/pouch/storage/volume/modules/tmpfs
+	@./hack/module --add-volume=github.com/alibaba/pouch/storage/volume/modules/local
 
 # install binaries
 .PHONY: install

diff --git a/main.go b/main.go
@@ -17,8 +17,8 @@ import (
 	"github.com/alibaba/pouch/lxcfs"
 	"github.com/alibaba/pouch/pkg/debug"
 	"github.com/alibaba/pouch/pkg/exec"
-	"github.com/alibaba/pouch/pkg/quota"
 	"github.com/alibaba/pouch/pkg/utils"
+	"github.com/alibaba/pouch/storage/quota"
 	"github.com/alibaba/pouch/version"
 
 	"github.com/docker/docker/pkg/reexec"

diff --git a/pkg/client/client.go → storage/controlserver/client/client.go b/pkg/client/client.go → storage/controlserver/client/client.go
diff --git a/pkg/client/errors.go → storage/controlserver/client/errors.go b/pkg/client/errors.go → storage/controlserver/client/errors.go
diff --git a/pkg/client/httpcli.go → storage/controlserver/client/httpcli.go b/pkg/client/httpcli.go → storage/controlserver/client/httpcli.go
diff --git a/pkg/client/httpcli_test.go → storage/controlserver/client/httpcli_test.go b/pkg/client/httpcli_test.go → storage/controlserver/client/httpcli_test.go
diff --git a/pkg/client/url.go → storage/controlserver/client/url.go b/pkg/client/url.go → storage/controlserver/client/url.go
diff --git a/pkg/client/url_test.go → storage/controlserver/client/url_test.go b/pkg/client/url_test.go → storage/controlserver/client/url_test.go
diff --git a/pkg/quota/grpquota.go → storage/quota/grpquota.go b/pkg/quota/grpquota.go → storage/quota/grpquota.go
diff --git a/pkg/quota/prjquota.go → storage/quota/prjquota.go b/pkg/quota/prjquota.go → storage/quota/prjquota.go
diff --git a/pkg/quota/quota.go → storage/quota/quota.go b/pkg/quota/quota.go → storage/quota/quota.go
diff --git a/pkg/quota/set_diskquota.go → storage/quota/set_diskquota.go b/pkg/quota/set_diskquota.go → storage/quota/set_diskquota.go
diff --git a/pkg/quota/type.go → storage/quota/type.go b/pkg/quota/type.go → storage/quota/type.go
diff --git a/volume/README.md → storage/volume/README.md b/volume/README.md → storage/volume/README.md
diff --git a/volume/config.go → storage/volume/config.go b/volume/config.go → storage/volume/config.go
diff --git a/volume/core.go → storage/volume/core.go b/volume/core.go → storage/volume/core.go
@@ -4,12 +4,12 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/alibaba/pouch/pkg/client"
 	metastore "github.com/alibaba/pouch/pkg/meta"
-	"github.com/alibaba/pouch/volume/driver"
-	volerr "github.com/alibaba/pouch/volume/error"
-	"github.com/alibaba/pouch/volume/types"
-	"github.com/alibaba/pouch/volume/types/meta"
+	"github.com/alibaba/pouch/storage/controlserver/client"
+	"github.com/alibaba/pouch/storage/volume/driver"
+	volerr "github.com/alibaba/pouch/storage/volume/error"
+	"github.com/alibaba/pouch/storage/volume/types"
+	"github.com/alibaba/pouch/storage/volume/types/meta"
 
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"

diff --git a/volume/core_util.go → storage/volume/core_util.go b/volume/core_util.go → storage/volume/core_util.go
@@ -9,11 +9,11 @@ import (
 	"time"
 
 	"github.com/alibaba/pouch/pkg/bytefmt"
-	"github.com/alibaba/pouch/pkg/client"
-	"github.com/alibaba/pouch/volume/driver"
-	volerr "github.com/alibaba/pouch/volume/error"
-	"github.com/alibaba/pouch/volume/types"
-	"github.com/alibaba/pouch/volume/types/meta"
+	"github.com/alibaba/pouch/storage/controlserver/client"
+	"github.com/alibaba/pouch/storage/volume/driver"
+	volerr "github.com/alibaba/pouch/storage/volume/error"
+	"github.com/alibaba/pouch/storage/volume/types"
+	"github.com/alibaba/pouch/storage/volume/types/meta"
 
 	"github.com/pborman/uuid"
 	"github.com/pkg/errors"

diff --git a/volume/driver/context.go → storage/volume/driver/context.go b/volume/driver/context.go → storage/volume/driver/context.go
diff --git a/volume/driver/driver.go → storage/volume/driver/driver.go b/volume/driver/driver.go → storage/volume/driver/driver.go
@@ -3,7 +3,7 @@ package driver
 import (
 	"regexp"
 
-	"github.com/alibaba/pouch/volume/types"
+	"github.com/alibaba/pouch/storage/volume/types"
 
 	"github.com/pkg/errors"
 )

diff --git a/volume/driver/driver_interface.go → storage/volume/driver/driver_interface.go b/volume/driver/driver_interface.go → storage/volume/driver/driver_interface.go
@@ -1,7 +1,7 @@
 package driver
 
 import (
-	"github.com/alibaba/pouch/volume/types"
+	"github.com/alibaba/pouch/storage/volume/types"
 )
 
 // Driver represents volume driver base operation interface.

diff --git a/volume/error/errors.go → storage/volume/error/errors.go b/volume/error/errors.go → storage/volume/error/errors.go
diff --git a/volume/examples/demo/demo.go → storage/volume/examples/demo/demo.go b/volume/examples/demo/demo.go → storage/volume/examples/demo/demo.go
@@ -3,8 +3,8 @@ package demo
 import (
 	"path"
 
-	"github.com/alibaba/pouch/volume/driver"
-	"github.com/alibaba/pouch/volume/types"
+	"github.com/alibaba/pouch/storage/volume/driver"
+	"github.com/alibaba/pouch/storage/volume/types"
 )
 
 func init() {

diff --git a/volume/modules/ceph/ceph.go → storage/volume/modules/ceph/ceph.go b/volume/modules/ceph/ceph.go → storage/volume/modules/ceph/ceph.go
@@ -13,9 +13,9 @@ import (
 
 	"github.com/alibaba/pouch/pkg/exec"
 	"github.com/alibaba/pouch/pkg/utils"
-	"github.com/alibaba/pouch/volume/driver"
-	"github.com/alibaba/pouch/volume/types"
-	"github.com/alibaba/pouch/volume/types/meta"
+	"github.com/alibaba/pouch/storage/volume/driver"
+	"github.com/alibaba/pouch/storage/volume/types"
+	"github.com/alibaba/pouch/storage/volume/types/meta"
 
 	"github.com/go-ini/ini"
 )

diff --git a/volume/modules/ceph/map.go → storage/volume/modules/ceph/map.go b/volume/modules/ceph/map.go → storage/volume/modules/ceph/map.go
@@ -10,8 +10,8 @@ import (
 	"time"
 
 	"github.com/alibaba/pouch/pkg/exec"
-	"github.com/alibaba/pouch/volume/driver"
-	"github.com/alibaba/pouch/volume/types"
+	"github.com/alibaba/pouch/storage/volume/driver"
+	"github.com/alibaba/pouch/storage/volume/types"
 )
 
 var (

diff --git a/volume/modules/ceph/types.go → storage/volume/modules/ceph/types.go b/volume/modules/ceph/types.go → storage/volume/modules/ceph/types.go
diff --git a/volume/modules/local/local.go → storage/volume/modules/local/local.go b/volume/modules/local/local.go → storage/volume/modules/local/local.go
@@ -10,9 +10,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/alibaba/pouch/pkg/quota"
-	"github.com/alibaba/pouch/volume/driver"
-	"github.com/alibaba/pouch/volume/types"
+	"github.com/alibaba/pouch/storage/quota"
+	"github.com/alibaba/pouch/storage/volume/driver"
+	"github.com/alibaba/pouch/storage/volume/types"
 )
 
 var (

diff --git a/volume/modules/tmpfs/tmpfs.go → storage/volume/modules/tmpfs/tmpfs.go b/volume/modules/tmpfs/tmpfs.go → storage/volume/modules/tmpfs/tmpfs.go
@@ -12,8 +12,8 @@ import (
 	"time"
 
 	"github.com/alibaba/pouch/pkg/utils"
-	"github.com/alibaba/pouch/volume/driver"
-	"github.com/alibaba/pouch/volume/types"
+	"github.com/alibaba/pouch/storage/volume/driver"
+	"github.com/alibaba/pouch/storage/volume/types"
 )
 
 var (

diff --git a/volume/types/meta/convert.go → storage/volume/types/meta/convert.go b/volume/types/meta/convert.go → storage/volume/types/meta/convert.go
diff --git a/volume/types/meta/meta.go → storage/volume/types/meta/meta.go b/volume/types/meta/meta.go → storage/volume/types/meta/meta.go
diff --git a/volume/types/meta/types.go → storage/volume/types/meta/types.go b/volume/types/meta/types.go → storage/volume/types/meta/types.go
diff --git a/volume/types/selector.go → storage/volume/types/selector.go b/volume/types/selector.go → storage/volume/types/selector.go
diff --git a/volume/types/storage.go → storage/volume/types/storage.go b/volume/types/storage.go → storage/volume/types/storage.go
@@ -3,7 +3,7 @@ package types
 import (
 	"time"
 
-	"github.com/alibaba/pouch/volume/types/meta"
+	"github.com/alibaba/pouch/storage/volume/types/meta"
 )
 
 // StorageSpec represents storage spec.

diff --git a/volume/types/types.go → storage/volume/types/types.go b/volume/types/types.go → storage/volume/types/types.go
diff --git a/volume/types/volume.go → storage/volume/types/volume.go b/volume/types/volume.go → storage/volume/types/volume.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/alibaba/pouch/volume/types/meta"
+	"github.com/alibaba/pouch/storage/volume/types/meta"
 )
 
 // VolumeConditionType defines volume condition type.

diff --git a/volume/vars.go → storage/volume/vars.go b/volume/vars.go → storage/volume/vars.go
@@ -1,7 +1,7 @@
 package volume
 
 import (
-	"github.com/alibaba/pouch/volume/types"
+	"github.com/alibaba/pouch/storage/volume/types"
 )
 
 const (