rename

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
 

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 (

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"

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"

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 {

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"

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"