Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: move pkg to correct places #1147

Merged
merged 1 commit into from
Apr 17, 2018
Merged

refactor: move pkg to correct places #1147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
0 pkg/opts/cpu.go → apis/opts/cpu.go
View file
Open in desktop
File renamed without changes.
0 pkg/opts/devicemappings.go → apis/opts/devicemappings.go
View file
Open in desktop
File renamed without changes.
0 pkg/opts/devicemappings_test.go → apis/opts/devicemappings_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/opts/diskquota.go → apis/opts/diskquota.go
View file
Open in desktop
File renamed without changes.
0 pkg/opts/diskquota_test.go → apis/opts/diskquota_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/opts/intel_rdt.go → apis/opts/intel_rdt.go
View file
Open in desktop
File renamed without changes.
0 pkg/opts/intel_rdt_test.go → apis/opts/intel_rdt_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/opts/labels.go → apis/opts/labels.go
View file
Open in desktop
File renamed without changes.
0 pkg/opts/labels_test.go → apis/opts/labels_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/opts/memory.go → apis/opts/memory.go
View file
Open in desktop
File renamed without changes.
0 pkg/opts/memory_swap.go → apis/opts/memory_swap.go
View file
Open in desktop
File renamed without changes.
0 pkg/opts/memory_swap_test.go → apis/opts/memory_swap_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/opts/memory_swappiness.go → apis/opts/memory_swappiness.go
View file
Open in desktop
File renamed without changes.
0 pkg/opts/memory_swappiness_test.go → apis/opts/memory_swappiness_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/opts/memory_test.go → apis/opts/memory_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/opts/mountpoint.go → apis/opts/mountpoint.go
View file
Open in desktop
File renamed without changes.
0 pkg/opts/mountpoint_test.go → apis/opts/mountpoint_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/opts/networks.go → apis/opts/networks.go
View file
Open in desktop
File renamed without changes.
0 pkg/opts/networks_test.go → apis/opts/networks_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/opts/oom_score.go → apis/opts/oom_score.go
View file
Open in desktop
File renamed without changes.
0 pkg/opts/portbindings.go → apis/opts/portbindings.go
View file
Open in desktop
File renamed without changes.
0 pkg/opts/portbindings_test.go → apis/opts/portbindings_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/opts/ports.go → apis/opts/ports.go
View file
Open in desktop
File renamed without changes.
0 pkg/opts/ports_test.go → apis/opts/ports_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/opts/restart_policy.go → apis/opts/restart_policy.go
View file
Open in desktop
File renamed without changes.
0 pkg/opts/restart_policy_test.go → apis/opts/restart_policy_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/opts/spec_annotation.go → apis/opts/spec_annotation.go
View file
Open in desktop
File renamed without changes.
0 pkg/opts/spec_annotation_test.go → apis/opts/spec_annotation_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/opts/sysctl.go → apis/opts/sysctl.go
View file
Open in desktop
File renamed without changes.
0 pkg/opts/sysctl_test.go → apis/opts/sysctl_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion cli/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion cli/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion daemon/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions daemon/mgr/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion daemon/mgr/spec_blkio.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion daemon/mgr/spec_devices.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions daemon/mgr/volume.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions hack/module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions hack/package/deb/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
0 pkg/client/client.go → storage/controlserver/client/client.go
View file
Open in desktop
File renamed without changes.
0 pkg/client/errors.go → storage/controlserver/client/errors.go
View file
Open in desktop
File renamed without changes.
0 pkg/client/httpcli.go → storage/controlserver/client/httpcli.go
View file
Open in desktop
File renamed without changes.
0 pkg/client/httpcli_test.go → storage/controlserver/client/httpcli_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/client/url.go → storage/controlserver/client/url.go
View file
Open in desktop
File renamed without changes.
0 pkg/client/url_test.go → storage/controlserver/client/url_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/quota/grpquota.go → storage/quota/grpquota.go
View file
Open in desktop
File renamed without changes.
0 pkg/quota/prjquota.go → storage/quota/prjquota.go
View file
Open in desktop
File renamed without changes.
0 pkg/quota/quota.go → storage/quota/quota.go
View file
Open in desktop
File renamed without changes.
0 pkg/quota/set_diskquota.go → storage/quota/set_diskquota.go
View file
Open in desktop
File renamed without changes.
0 pkg/quota/type.go → storage/quota/type.go
View file
Open in desktop
File renamed without changes.
0 volume/README.md → storage/volume/README.md
View file
Open in desktop
File renamed without changes.
0 volume/config.go → storage/volume/config.go
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions volume/core.go → storage/volume/core.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 5 additions & 5 deletions volume/core_util.go → storage/volume/core_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
0 volume/driver/context.go → storage/volume/driver/context.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion volume/driver/driver.go → storage/volume/driver/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion volume/driver/driver_interface.go → storage/volume/driver/driver_interface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
0 volume/error/errors.go → storage/volume/error/errors.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions volume/examples/demo/demo.go → storage/volume/examples/demo/demo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
6 changes: 3 additions & 3 deletions volume/modules/ceph/ceph.go → storage/volume/modules/ceph/ceph.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions volume/modules/ceph/map.go → storage/volume/modules/ceph/map.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
0 volume/modules/ceph/types.go → storage/volume/modules/ceph/types.go
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions volume/modules/local/local.go → storage/volume/modules/local/local.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions volume/modules/tmpfs/tmpfs.go → storage/volume/modules/tmpfs/tmpfs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
0 volume/types/meta/convert.go → storage/volume/types/meta/convert.go
View file
Open in desktop
File renamed without changes.
0 volume/types/meta/meta.go → storage/volume/types/meta/meta.go
View file
Open in desktop
File renamed without changes.
0 volume/types/meta/types.go → storage/volume/types/meta/types.go
View file
Open in desktop
File renamed without changes.
0 volume/types/selector.go → storage/volume/types/selector.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion volume/types/storage.go → storage/volume/types/storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
0 volume/types/types.go → storage/volume/types/types.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion volume/types/volume.go → storage/volume/types/volume.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion volume/vars.go → storage/volume/vars.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package volume

import (
"github.com/alibaba/pouch/volume/types"
"github.com/alibaba/pouch/storage/volume/types"
)

const (
Expand Down