diff --git a/Makefile b/Makefile index bc1b4edd..9d874b68 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ kubevpn-linux: .PHONY: control-plane-linux control-plane-linux: - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o envoy-xds-server github.com/wencaiwulue/kubevpn/pkg/control_plane/cmd/server + CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o envoy-xds-server github.com/wencaiwulue/kubevpn/pkg/controlplane/cmd/server chmod +x envoy-xds-server .PHONY: image @@ -32,7 +32,7 @@ image_mesh: .PHONY: image_control_plane image_control_plane: control-plane-linux - docker build -t naison/envoy-xds-server:latest -f ./dockerfile/control_plane/Dockerfile . + docker build -t naison/envoy-xds-server:latest -f ./dockerfile/controlplane/Dockerfile . rm -fr envoy-xds-server docker push naison/envoy-xds-server:latest diff --git a/dockerfile/control_plane/Dockerfile b/dockerfile/controlplane/Dockerfile similarity index 100% rename from dockerfile/control_plane/Dockerfile rename to dockerfile/controlplane/Dockerfile diff --git a/pkg/control_plane/apis/v1alpha1/envoy.go b/pkg/controlplane/apis/v1alpha1/envoy.go similarity index 100% rename from pkg/control_plane/apis/v1alpha1/envoy.go rename to pkg/controlplane/apis/v1alpha1/envoy.go diff --git a/pkg/control_plane/cmd/server/main.go b/pkg/controlplane/cmd/server/main.go similarity index 87% rename from pkg/control_plane/cmd/server/main.go rename to pkg/controlplane/cmd/server/main.go index 098d1fa6..fe38b094 100644 --- a/pkg/control_plane/cmd/server/main.go +++ b/pkg/controlplane/cmd/server/main.go @@ -6,9 +6,9 @@ import ( "github.com/envoyproxy/go-control-plane/pkg/cache/v3" serverv3 "github.com/envoyproxy/go-control-plane/pkg/server/v3" log "github.com/sirupsen/logrus" - "github.com/wencaiwulue/kubevpn/pkg/control_plane/internal/processor" - "github.com/wencaiwulue/kubevpn/pkg/control_plane/internal/server" - "github.com/wencaiwulue/kubevpn/pkg/control_plane/internal/watcher" + "github.com/wencaiwulue/kubevpn/pkg/controlplane/internal/processor" + "github.com/wencaiwulue/kubevpn/pkg/controlplane/internal/server" + "github.com/wencaiwulue/kubevpn/pkg/controlplane/internal/watcher" ) var ( diff --git a/pkg/control_plane/internal/processor/parser_test.go b/pkg/controlplane/internal/processor/parser_test.go similarity index 96% rename from pkg/control_plane/internal/processor/parser_test.go rename to pkg/controlplane/internal/processor/parser_test.go index 19dd679e..d294d110 100644 --- a/pkg/control_plane/internal/processor/parser_test.go +++ b/pkg/controlplane/internal/processor/parser_test.go @@ -7,7 +7,7 @@ package processor import ( "fmt" - "github.com/wencaiwulue/kubevpn/pkg/control_plane/apis/v1alpha1" + "github.com/wencaiwulue/kubevpn/pkg/controlplane/apis/v1alpha1" "github.com/wencaiwulue/kubevpn/util" "gopkg.in/yaml.v2" "testing" diff --git a/pkg/control_plane/internal/processor/processor.go b/pkg/controlplane/internal/processor/processor.go similarity index 93% rename from pkg/control_plane/internal/processor/processor.go rename to pkg/controlplane/internal/processor/processor.go index a490a87a..85185885 100644 --- a/pkg/control_plane/internal/processor/processor.go +++ b/pkg/controlplane/internal/processor/processor.go @@ -6,9 +6,9 @@ import ( "github.com/envoyproxy/go-control-plane/pkg/cache/v3" "github.com/envoyproxy/go-control-plane/pkg/resource/v3" "github.com/sirupsen/logrus" - "github.com/wencaiwulue/kubevpn/pkg/control_plane/internal/resources" - "github.com/wencaiwulue/kubevpn/pkg/control_plane/internal/watcher" - "github.com/wencaiwulue/kubevpn/pkg/control_plane/internal/xdscache" + "github.com/wencaiwulue/kubevpn/pkg/controlplane/internal/resources" + "github.com/wencaiwulue/kubevpn/pkg/controlplane/internal/watcher" + "github.com/wencaiwulue/kubevpn/pkg/controlplane/internal/xdscache" "github.com/wencaiwulue/kubevpn/util" "math" "math/rand" diff --git a/pkg/control_plane/internal/resources/cache.go b/pkg/controlplane/internal/resources/cache.go similarity index 100% rename from pkg/control_plane/internal/resources/cache.go rename to pkg/controlplane/internal/resources/cache.go diff --git a/pkg/control_plane/internal/resources/resource.go b/pkg/controlplane/internal/resources/resource.go similarity index 100% rename from pkg/control_plane/internal/resources/resource.go rename to pkg/controlplane/internal/resources/resource.go diff --git a/pkg/control_plane/internal/server/server.go b/pkg/controlplane/internal/server/server.go similarity index 100% rename from pkg/control_plane/internal/server/server.go rename to pkg/controlplane/internal/server/server.go diff --git a/pkg/control_plane/internal/watcher/watcher.go b/pkg/controlplane/internal/watcher/watcher.go similarity index 100% rename from pkg/control_plane/internal/watcher/watcher.go rename to pkg/controlplane/internal/watcher/watcher.go diff --git a/pkg/control_plane/internal/xdscache/cache.go b/pkg/controlplane/internal/xdscache/cache.go similarity index 93% rename from pkg/control_plane/internal/xdscache/cache.go rename to pkg/controlplane/internal/xdscache/cache.go index 9d888e6b..5ff4569e 100644 --- a/pkg/control_plane/internal/xdscache/cache.go +++ b/pkg/controlplane/internal/xdscache/cache.go @@ -2,8 +2,8 @@ package xdscache import ( "github.com/envoyproxy/go-control-plane/pkg/cache/types" - "github.com/wencaiwulue/kubevpn/pkg/control_plane/apis/v1alpha1" - "github.com/wencaiwulue/kubevpn/pkg/control_plane/internal/resources" + "github.com/wencaiwulue/kubevpn/pkg/controlplane/apis/v1alpha1" + "github.com/wencaiwulue/kubevpn/pkg/controlplane/internal/resources" ) type XDSCache struct { diff --git a/pkg/envoy.go b/pkg/envoy.go index 4a1d74ea..93d2e7f2 100644 --- a/pkg/envoy.go +++ b/pkg/envoy.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/pkg/errors" log "github.com/sirupsen/logrus" - "github.com/wencaiwulue/kubevpn/pkg/control_plane/apis/v1alpha1" + "github.com/wencaiwulue/kubevpn/pkg/controlplane/apis/v1alpha1" "github.com/wencaiwulue/kubevpn/pkg/mesh" "github.com/wencaiwulue/kubevpn/util" "gopkg.in/yaml.v2" diff --git a/util/util.go b/util/util.go index ac903508..3f635675 100644 --- a/util/util.go +++ b/util/util.go @@ -11,7 +11,7 @@ import ( dockerterm "github.com/moby/term" "github.com/pkg/errors" log "github.com/sirupsen/logrus" - "github.com/wencaiwulue/kubevpn/pkg/control_plane/apis/v1alpha1" + "github.com/wencaiwulue/kubevpn/pkg/controlplane/apis/v1alpha1" "golang.org/x/net/icmp" "golang.org/x/net/ipv4" "gopkg.in/yaml.v2"