diff --git a/Makefile b/Makefile index bed57208..9aacc260 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ GOARCH := $(shell go env GOHOSTARCH) TARGET := kubevpn-${GOOS}-${GOARCH} OS_ARCH := ${GOOS}/${GOARCH} -BASE := github.com/wencaiwulue/kubevpn +BASE := github.com/wencaiwulue/kubevpn/v2 FOLDER := ${BASE}/cmd/kubevpn BUILD_DIR := ./build OUTPUT_DIR := ./bin @@ -97,7 +97,7 @@ container-test: kubevpn-linux-amd64 .PHONY: version version: - go run github.com/wencaiwulue/kubevpn/pkg/util/krew + go run ${BASE}/pkg/util/krew .PHONY: gen gen: diff --git a/cmd/kubevpn/cmds/clone.go b/cmd/kubevpn/cmds/clone.go index eed850c0..4f7e7ab3 100644 --- a/cmd/kubevpn/cmds/clone.go +++ b/cmd/kubevpn/cmds/clone.go @@ -14,11 +14,11 @@ import ( "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "github.com/wencaiwulue/kubevpn/pkg/config" - "github.com/wencaiwulue/kubevpn/pkg/daemon" - "github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" - "github.com/wencaiwulue/kubevpn/pkg/handler" - "github.com/wencaiwulue/kubevpn/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" + "github.com/wencaiwulue/kubevpn/v2/pkg/handler" + "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) // CmdClone multiple cluster operate, can start up one deployment to another cluster diff --git a/cmd/kubevpn/cmds/config.go b/cmd/kubevpn/cmds/config.go index b212508a..fed537eb 100644 --- a/cmd/kubevpn/cmds/config.go +++ b/cmd/kubevpn/cmds/config.go @@ -9,9 +9,9 @@ import ( "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "github.com/wencaiwulue/kubevpn/pkg/daemon" - "github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" - "github.com/wencaiwulue/kubevpn/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" + "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) func CmdConfig(f cmdutil.Factory) *cobra.Command { diff --git a/cmd/kubevpn/cmds/connect.go b/cmd/kubevpn/cmds/connect.go index 66c3cb4d..1858d3e0 100644 --- a/cmd/kubevpn/cmds/connect.go +++ b/cmd/kubevpn/cmds/connect.go @@ -13,11 +13,11 @@ import ( "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "github.com/wencaiwulue/kubevpn/pkg/config" - "github.com/wencaiwulue/kubevpn/pkg/daemon" - "github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" - "github.com/wencaiwulue/kubevpn/pkg/handler" - "github.com/wencaiwulue/kubevpn/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" + "github.com/wencaiwulue/kubevpn/v2/pkg/handler" + "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) func CmdConnect(f cmdutil.Factory) *cobra.Command { diff --git a/cmd/kubevpn/cmds/controlplane.go b/cmd/kubevpn/cmds/controlplane.go index bf17f27a..58a377dc 100644 --- a/cmd/kubevpn/cmds/controlplane.go +++ b/cmd/kubevpn/cmds/controlplane.go @@ -5,9 +5,9 @@ import ( "github.com/spf13/cobra" cmdutil "k8s.io/kubectl/pkg/cmd/util" - "github.com/wencaiwulue/kubevpn/pkg/config" - "github.com/wencaiwulue/kubevpn/pkg/controlplane" - "github.com/wencaiwulue/kubevpn/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/controlplane" + "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) func CmdControlPlane(_ cmdutil.Factory) *cobra.Command { diff --git a/cmd/kubevpn/cmds/cp.go b/cmd/kubevpn/cmds/cp.go index 2af9820c..4e7bb8b4 100644 --- a/cmd/kubevpn/cmds/cp.go +++ b/cmd/kubevpn/cmds/cp.go @@ -12,9 +12,9 @@ import ( "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "github.com/wencaiwulue/kubevpn/pkg/cp" - "github.com/wencaiwulue/kubevpn/pkg/handler" - "github.com/wencaiwulue/kubevpn/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/cp" + "github.com/wencaiwulue/kubevpn/v2/pkg/handler" + "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) var cpExample = templates.Examples(i18n.T(` diff --git a/cmd/kubevpn/cmds/daemon.go b/cmd/kubevpn/cmds/daemon.go index 6f57e64a..7760d398 100644 --- a/cmd/kubevpn/cmds/daemon.go +++ b/cmd/kubevpn/cmds/daemon.go @@ -9,7 +9,7 @@ import ( cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/util/i18n" - "github.com/wencaiwulue/kubevpn/pkg/daemon" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon" ) func CmdDaemon(_ cmdutil.Factory) *cobra.Command { diff --git a/cmd/kubevpn/cmds/dev.go b/cmd/kubevpn/cmds/dev.go index d5a334c8..a98afa73 100644 --- a/cmd/kubevpn/cmds/dev.go +++ b/cmd/kubevpn/cmds/dev.go @@ -13,11 +13,11 @@ import ( "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "github.com/wencaiwulue/kubevpn/pkg/config" - "github.com/wencaiwulue/kubevpn/pkg/daemon" - "github.com/wencaiwulue/kubevpn/pkg/dev" - "github.com/wencaiwulue/kubevpn/pkg/handler" - "github.com/wencaiwulue/kubevpn/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon" + "github.com/wencaiwulue/kubevpn/v2/pkg/dev" + "github.com/wencaiwulue/kubevpn/v2/pkg/handler" + "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) func CmdDev(f cmdutil.Factory) *cobra.Command { diff --git a/cmd/kubevpn/cmds/disconnect.go b/cmd/kubevpn/cmds/disconnect.go index ae7df63c..cf4f4283 100644 --- a/cmd/kubevpn/cmds/disconnect.go +++ b/cmd/kubevpn/cmds/disconnect.go @@ -14,8 +14,8 @@ import ( "k8s.io/kubectl/pkg/util/templates" "k8s.io/utils/pointer" - "github.com/wencaiwulue/kubevpn/pkg/daemon" - "github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" ) func CmdDisconnect(f cmdutil.Factory) *cobra.Command { diff --git a/cmd/kubevpn/cmds/get.go b/cmd/kubevpn/cmds/get.go index d7b56f2c..e77beb05 100644 --- a/cmd/kubevpn/cmds/get.go +++ b/cmd/kubevpn/cmds/get.go @@ -10,8 +10,8 @@ import ( "k8s.io/kubectl/pkg/util/templates" "sigs.k8s.io/yaml" - "github.com/wencaiwulue/kubevpn/pkg/daemon" - "github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" ) func CmdGet(f cmdutil.Factory) *cobra.Command { diff --git a/cmd/kubevpn/cmds/leave.go b/cmd/kubevpn/cmds/leave.go index e5905726..5f320413 100644 --- a/cmd/kubevpn/cmds/leave.go +++ b/cmd/kubevpn/cmds/leave.go @@ -12,8 +12,8 @@ import ( "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "github.com/wencaiwulue/kubevpn/pkg/daemon" - "github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" ) func CmdLeave(f cmdutil.Factory) *cobra.Command { diff --git a/cmd/kubevpn/cmds/list.go b/cmd/kubevpn/cmds/list.go index 4962b970..a36f5175 100644 --- a/cmd/kubevpn/cmds/list.go +++ b/cmd/kubevpn/cmds/list.go @@ -8,8 +8,8 @@ import ( "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "github.com/wencaiwulue/kubevpn/pkg/daemon" - "github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" ) func CmdList(f cmdutil.Factory) *cobra.Command { diff --git a/cmd/kubevpn/cmds/logs.go b/cmd/kubevpn/cmds/logs.go index 575cb914..a7369f76 100644 --- a/cmd/kubevpn/cmds/logs.go +++ b/cmd/kubevpn/cmds/logs.go @@ -12,8 +12,8 @@ import ( "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "github.com/wencaiwulue/kubevpn/pkg/daemon" - "github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" ) func CmdLogs(f cmdutil.Factory) *cobra.Command { diff --git a/cmd/kubevpn/cmds/proxy.go b/cmd/kubevpn/cmds/proxy.go index 573987d4..3c44fbb5 100644 --- a/cmd/kubevpn/cmds/proxy.go +++ b/cmd/kubevpn/cmds/proxy.go @@ -15,11 +15,11 @@ import ( "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "github.com/wencaiwulue/kubevpn/pkg/config" - "github.com/wencaiwulue/kubevpn/pkg/daemon" - "github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" - "github.com/wencaiwulue/kubevpn/pkg/handler" - "github.com/wencaiwulue/kubevpn/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" + "github.com/wencaiwulue/kubevpn/v2/pkg/handler" + "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) func CmdProxy(f cmdutil.Factory) *cobra.Command { diff --git a/cmd/kubevpn/cmds/quit.go b/cmd/kubevpn/cmds/quit.go index 265edffc..3d49afd7 100644 --- a/cmd/kubevpn/cmds/quit.go +++ b/cmd/kubevpn/cmds/quit.go @@ -13,8 +13,8 @@ import ( "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "github.com/wencaiwulue/kubevpn/pkg/daemon" - "github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" ) func CmdQuit(f cmdutil.Factory) *cobra.Command { diff --git a/cmd/kubevpn/cmds/remove.go b/cmd/kubevpn/cmds/remove.go index 70c14cb5..bebfabc9 100644 --- a/cmd/kubevpn/cmds/remove.go +++ b/cmd/kubevpn/cmds/remove.go @@ -12,8 +12,8 @@ import ( "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "github.com/wencaiwulue/kubevpn/pkg/daemon" - "github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" ) func CmdRemove(f cmdutil.Factory) *cobra.Command { diff --git a/cmd/kubevpn/cmds/reset.go b/cmd/kubevpn/cmds/reset.go index d56feb80..43e3f52c 100644 --- a/cmd/kubevpn/cmds/reset.go +++ b/cmd/kubevpn/cmds/reset.go @@ -10,8 +10,8 @@ import ( "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "github.com/wencaiwulue/kubevpn/pkg/handler" - "github.com/wencaiwulue/kubevpn/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/handler" + "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) func CmdReset(factory cmdutil.Factory) *cobra.Command { diff --git a/cmd/kubevpn/cmds/root.go b/cmd/kubevpn/cmds/root.go index d1b12f5f..3b19e2fd 100644 --- a/cmd/kubevpn/cmds/root.go +++ b/cmd/kubevpn/cmds/root.go @@ -12,7 +12,7 @@ import ( "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "github.com/wencaiwulue/kubevpn/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" ) func NewKubeVPNCommand() *cobra.Command { diff --git a/cmd/kubevpn/cmds/serve.go b/cmd/kubevpn/cmds/serve.go index 3a56430c..9662bcf0 100644 --- a/cmd/kubevpn/cmds/serve.go +++ b/cmd/kubevpn/cmds/serve.go @@ -12,10 +12,10 @@ import ( "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "github.com/wencaiwulue/kubevpn/pkg/config" - "github.com/wencaiwulue/kubevpn/pkg/core" - "github.com/wencaiwulue/kubevpn/pkg/handler" - "github.com/wencaiwulue/kubevpn/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/core" + "github.com/wencaiwulue/kubevpn/v2/pkg/handler" + "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) func CmdServe(_ cmdutil.Factory) *cobra.Command { diff --git a/cmd/kubevpn/cmds/ssh.go b/cmd/kubevpn/cmds/ssh.go index 190a2c8a..370d3774 100644 --- a/cmd/kubevpn/cmds/ssh.go +++ b/cmd/kubevpn/cmds/ssh.go @@ -18,8 +18,8 @@ import ( "k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/term" - "github.com/wencaiwulue/kubevpn/pkg/daemon" - "github.com/wencaiwulue/kubevpn/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon" + "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) // CmdSSH diff --git a/cmd/kubevpn/cmds/sshdaemon.go b/cmd/kubevpn/cmds/sshdaemon.go index 5f26b271..55aab21d 100644 --- a/cmd/kubevpn/cmds/sshdaemon.go +++ b/cmd/kubevpn/cmds/sshdaemon.go @@ -9,8 +9,8 @@ import ( "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "github.com/wencaiwulue/kubevpn/pkg/daemon" - "github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" ) // CmdSSHDaemon diff --git a/cmd/kubevpn/cmds/status.go b/cmd/kubevpn/cmds/status.go index 0c4d3a66..cba633df 100644 --- a/cmd/kubevpn/cmds/status.go +++ b/cmd/kubevpn/cmds/status.go @@ -9,8 +9,8 @@ import ( "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "github.com/wencaiwulue/kubevpn/pkg/daemon" - "github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" ) func CmdStatus(f cmdutil.Factory) *cobra.Command { diff --git a/cmd/kubevpn/cmds/upgrade.go b/cmd/kubevpn/cmds/upgrade.go index 5658ee90..6bb8a85b 100644 --- a/cmd/kubevpn/cmds/upgrade.go +++ b/cmd/kubevpn/cmds/upgrade.go @@ -11,11 +11,11 @@ import ( "golang.org/x/oauth2" cmdutil "k8s.io/kubectl/pkg/cmd/util" - "github.com/wencaiwulue/kubevpn/pkg/config" - "github.com/wencaiwulue/kubevpn/pkg/daemon" - "github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" - "github.com/wencaiwulue/kubevpn/pkg/upgrade" - "github.com/wencaiwulue/kubevpn/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" + "github.com/wencaiwulue/kubevpn/v2/pkg/upgrade" + "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) func CmdUpgrade(_ cmdutil.Factory) *cobra.Command { diff --git a/cmd/kubevpn/cmds/version.go b/cmd/kubevpn/cmds/version.go index 501ac58d..947c200a 100644 --- a/cmd/kubevpn/cmds/version.go +++ b/cmd/kubevpn/cmds/version.go @@ -10,9 +10,9 @@ import ( "github.com/spf13/cobra" cmdutil "k8s.io/kubectl/pkg/cmd/util" - "github.com/wencaiwulue/kubevpn/pkg/config" - "github.com/wencaiwulue/kubevpn/pkg/daemon" - "github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" ) // --ldflags -X diff --git a/cmd/kubevpn/cmds/webhook.go b/cmd/kubevpn/cmds/webhook.go index dc5d652f..a21d052b 100644 --- a/cmd/kubevpn/cmds/webhook.go +++ b/cmd/kubevpn/cmds/webhook.go @@ -4,8 +4,8 @@ import ( "github.com/spf13/cobra" cmdutil "k8s.io/kubectl/pkg/cmd/util" - "github.com/wencaiwulue/kubevpn/pkg/util" - "github.com/wencaiwulue/kubevpn/pkg/webhook" + "github.com/wencaiwulue/kubevpn/v2/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/webhook" ) func CmdWebhook(f cmdutil.Factory) *cobra.Command { diff --git a/cmd/kubevpn/main.go b/cmd/kubevpn/main.go index 5e1afcd7..b5d38dde 100644 --- a/cmd/kubevpn/main.go +++ b/cmd/kubevpn/main.go @@ -6,7 +6,7 @@ import ( _ "k8s.io/client-go/plugin/pkg/client/auth" _ "net/http/pprof" - "github.com/wencaiwulue/kubevpn/cmd/kubevpn/cmds" + "github.com/wencaiwulue/kubevpn/v2/cmd/kubevpn/cmds" ) func main() { diff --git a/go.mod b/go.mod index be66d0fe..b2c7fac4 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/wencaiwulue/kubevpn +module github.com/wencaiwulue/kubevpn/v2 go 1.20 diff --git a/pkg/core/gvisortcpforwarder.go b/pkg/core/gvisortcpforwarder.go index d962a107..d1ff7c45 100644 --- a/pkg/core/gvisortcpforwarder.go +++ b/pkg/core/gvisortcpforwarder.go @@ -15,7 +15,7 @@ import ( "gvisor.dev/gvisor/pkg/tcpip/transport/tcp" "gvisor.dev/gvisor/pkg/waiter" - "github.com/wencaiwulue/kubevpn/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" ) var GvisorTCPForwardAddr string diff --git a/pkg/core/gvisortcphandler.go b/pkg/core/gvisortcphandler.go index eee7e656..d7c1f75a 100644 --- a/pkg/core/gvisortcphandler.go +++ b/pkg/core/gvisortcphandler.go @@ -10,7 +10,7 @@ import ( log "github.com/sirupsen/logrus" - "github.com/wencaiwulue/kubevpn/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" ) type gvisorTCPTunnelConnector struct { diff --git a/pkg/core/gvisorudpforwarder.go b/pkg/core/gvisorudpforwarder.go index a109640c..c2b1c6c5 100644 --- a/pkg/core/gvisorudpforwarder.go +++ b/pkg/core/gvisorudpforwarder.go @@ -11,7 +11,7 @@ import ( "gvisor.dev/gvisor/pkg/tcpip/transport/udp" "gvisor.dev/gvisor/pkg/waiter" - "github.com/wencaiwulue/kubevpn/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" ) var GvisorUDPForwardAddr string diff --git a/pkg/core/gvisorudphandler.go b/pkg/core/gvisorudphandler.go index 904c3699..834c05f3 100644 --- a/pkg/core/gvisorudphandler.go +++ b/pkg/core/gvisorudphandler.go @@ -9,7 +9,7 @@ import ( log "github.com/sirupsen/logrus" "gvisor.dev/gvisor/pkg/tcpip/stack" - "github.com/wencaiwulue/kubevpn/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" ) type gvisorUDPOverTCPTunnelConnector struct { diff --git a/pkg/core/route.go b/pkg/core/route.go index cf156689..f3e6d083 100644 --- a/pkg/core/route.go +++ b/pkg/core/route.go @@ -11,8 +11,8 @@ import ( "github.com/pkg/errors" log "github.com/sirupsen/logrus" - "github.com/wencaiwulue/kubevpn/pkg/config" - "github.com/wencaiwulue/kubevpn/pkg/tun" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/tun" ) var ( diff --git a/pkg/core/tcp.go b/pkg/core/tcp.go index 05e992d5..3b2ce46c 100644 --- a/pkg/core/tcp.go +++ b/pkg/core/tcp.go @@ -4,7 +4,7 @@ import ( "context" "net" - "github.com/wencaiwulue/kubevpn/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" ) type tcpTransporter struct{} diff --git a/pkg/core/tcphandler.go b/pkg/core/tcphandler.go index d8b3d90b..fa72a293 100644 --- a/pkg/core/tcphandler.go +++ b/pkg/core/tcphandler.go @@ -8,8 +8,8 @@ import ( log "github.com/sirupsen/logrus" - "github.com/wencaiwulue/kubevpn/pkg/config" - "github.com/wencaiwulue/kubevpn/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) type fakeUDPTunnelConnector struct { diff --git a/pkg/core/tunendpoint.go b/pkg/core/tunendpoint.go index 07dffa00..36b48b58 100755 --- a/pkg/core/tunendpoint.go +++ b/pkg/core/tunendpoint.go @@ -16,7 +16,7 @@ import ( "gvisor.dev/gvisor/pkg/tcpip/stack" "gvisor.dev/gvisor/pkg/tcpip/transport/tcp" - "github.com/wencaiwulue/kubevpn/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" ) var _ stack.LinkEndpoint = (*tunEndpoint)(nil) diff --git a/pkg/core/tunhandler.go b/pkg/core/tunhandler.go index 67c2cf74..812e1d30 100644 --- a/pkg/core/tunhandler.go +++ b/pkg/core/tunhandler.go @@ -13,8 +13,8 @@ import ( "github.com/google/gopacket/layers" log "github.com/sirupsen/logrus" - "github.com/wencaiwulue/kubevpn/pkg/config" - "github.com/wencaiwulue/kubevpn/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) const ( diff --git a/pkg/core/tunhandlerclient.go b/pkg/core/tunhandlerclient.go index c245e666..aef19197 100644 --- a/pkg/core/tunhandlerclient.go +++ b/pkg/core/tunhandlerclient.go @@ -8,7 +8,7 @@ import ( log "github.com/sirupsen/logrus" - "github.com/wencaiwulue/kubevpn/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" ) func (h *tunHandler) HandleClient(ctx context.Context, tun net.Conn) { diff --git a/pkg/core/udpovertcp.go b/pkg/core/udpovertcp.go index a8b8ce41..3d451347 100644 --- a/pkg/core/udpovertcp.go +++ b/pkg/core/udpovertcp.go @@ -6,7 +6,7 @@ import ( "io" "net" - "github.com/wencaiwulue/kubevpn/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" ) type datagramPacket struct { diff --git a/pkg/daemon/action/clone.go b/pkg/daemon/action/clone.go index c4af359c..3e59bee5 100644 --- a/pkg/daemon/action/clone.go +++ b/pkg/daemon/action/clone.go @@ -9,10 +9,10 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/wencaiwulue/kubevpn/pkg/config" - "github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" - "github.com/wencaiwulue/kubevpn/pkg/handler" - "github.com/wencaiwulue/kubevpn/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" + "github.com/wencaiwulue/kubevpn/v2/pkg/handler" + "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) func (svr *Server) Clone(req *rpc.CloneRequest, resp rpc.Daemon_CloneServer) error { diff --git a/pkg/daemon/action/config.go b/pkg/daemon/action/config.go index e2ddf50d..ae27be4b 100644 --- a/pkg/daemon/action/config.go +++ b/pkg/daemon/action/config.go @@ -4,10 +4,10 @@ import ( "context" "github.com/spf13/pflag" - "github.com/wencaiwulue/kubevpn/pkg/handler" - "github.com/wencaiwulue/kubevpn/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/handler" + "github.com/wencaiwulue/kubevpn/v2/pkg/util" - "github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" ) var CancelFunc = make(map[string]context.CancelFunc) diff --git a/pkg/daemon/action/connect-fork.go b/pkg/daemon/action/connect-fork.go index 60f84fda..ee5c8d72 100644 --- a/pkg/daemon/action/connect-fork.go +++ b/pkg/daemon/action/connect-fork.go @@ -10,10 +10,10 @@ import ( "github.com/spf13/pflag" "k8s.io/utils/pointer" - "github.com/wencaiwulue/kubevpn/pkg/config" - "github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" - "github.com/wencaiwulue/kubevpn/pkg/handler" - "github.com/wencaiwulue/kubevpn/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" + "github.com/wencaiwulue/kubevpn/v2/pkg/handler" + "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) func (svr *Server) ConnectFork(req *rpc.ConnectRequest, resp rpc.Daemon_ConnectForkServer) error { diff --git a/pkg/daemon/action/connect.go b/pkg/daemon/action/connect.go index 2e6792ec..e3b451a4 100644 --- a/pkg/daemon/action/connect.go +++ b/pkg/daemon/action/connect.go @@ -19,10 +19,10 @@ import ( cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/utils/pointer" - "github.com/wencaiwulue/kubevpn/pkg/config" - "github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" - "github.com/wencaiwulue/kubevpn/pkg/handler" - "github.com/wencaiwulue/kubevpn/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" + "github.com/wencaiwulue/kubevpn/v2/pkg/handler" + "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) func (svr *Server) Connect(req *rpc.ConnectRequest, resp rpc.Daemon_ConnectServer) error { diff --git a/pkg/daemon/action/disconnect.go b/pkg/daemon/action/disconnect.go index 3a34ee41..8a31c319 100644 --- a/pkg/daemon/action/disconnect.go +++ b/pkg/daemon/action/disconnect.go @@ -7,8 +7,8 @@ import ( log "github.com/sirupsen/logrus" - "github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" - "github.com/wencaiwulue/kubevpn/pkg/dns" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" + "github.com/wencaiwulue/kubevpn/v2/pkg/dns" ) func (svr *Server) Disconnect(req *rpc.DisconnectRequest, resp rpc.Daemon_DisconnectServer) error { diff --git a/pkg/daemon/action/get.go b/pkg/daemon/action/get.go index 33d49551..ff266033 100644 --- a/pkg/daemon/action/get.go +++ b/pkg/daemon/action/get.go @@ -14,7 +14,7 @@ import ( "k8s.io/client-go/metadata/metadatainformer" "k8s.io/client-go/restmapper" - "github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" ) func (svr *Server) Get(ctx context.Context, req *rpc.GetRequest) (*rpc.GetResponse, error) { diff --git a/pkg/daemon/action/leave.go b/pkg/daemon/action/leave.go index 2ccf18d3..d589e48a 100644 --- a/pkg/daemon/action/leave.go +++ b/pkg/daemon/action/leave.go @@ -6,8 +6,8 @@ import ( log "github.com/sirupsen/logrus" - "github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" - "github.com/wencaiwulue/kubevpn/pkg/handler" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" + "github.com/wencaiwulue/kubevpn/v2/pkg/handler" ) func (svr *Server) Leave(req *rpc.LeaveRequest, resp rpc.Daemon_LeaveServer) error { diff --git a/pkg/daemon/action/list.go b/pkg/daemon/action/list.go index 2e36684f..103394bf 100644 --- a/pkg/daemon/action/list.go +++ b/pkg/daemon/action/list.go @@ -9,9 +9,9 @@ import ( "k8s.io/apimachinery/pkg/util/yaml" k8syaml "sigs.k8s.io/yaml" - "github.com/wencaiwulue/kubevpn/pkg/config" - "github.com/wencaiwulue/kubevpn/pkg/controlplane" - "github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/controlplane" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" ) func (svr *Server) List(ctx context.Context, req *rpc.ListRequest) (*rpc.ListResponse, error) { diff --git a/pkg/daemon/action/logs.go b/pkg/daemon/action/logs.go index a701e9be..428ca693 100644 --- a/pkg/daemon/action/logs.go +++ b/pkg/daemon/action/logs.go @@ -3,7 +3,7 @@ package action import ( "github.com/hpcloud/tail" - "github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" ) func (svr *Server) Logs(req *rpc.LogRequest, resp rpc.Daemon_LogsServer) error { diff --git a/pkg/daemon/action/proxy.go b/pkg/daemon/action/proxy.go index 38d9ec7e..2d5b605a 100644 --- a/pkg/daemon/action/proxy.go +++ b/pkg/daemon/action/proxy.go @@ -8,10 +8,10 @@ import ( "github.com/spf13/pflag" "k8s.io/utils/pointer" - "github.com/wencaiwulue/kubevpn/pkg/config" - "github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" - "github.com/wencaiwulue/kubevpn/pkg/handler" - "github.com/wencaiwulue/kubevpn/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" + "github.com/wencaiwulue/kubevpn/v2/pkg/handler" + "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) // Proxy diff --git a/pkg/daemon/action/quit.go b/pkg/daemon/action/quit.go index 0a3bdacf..3f73680d 100644 --- a/pkg/daemon/action/quit.go +++ b/pkg/daemon/action/quit.go @@ -5,8 +5,8 @@ import ( log "github.com/sirupsen/logrus" - "github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" - "github.com/wencaiwulue/kubevpn/pkg/dns" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" + "github.com/wencaiwulue/kubevpn/v2/pkg/dns" ) func (svr *Server) Quit(req *rpc.QuitRequest, resp rpc.Daemon_QuitServer) error { diff --git a/pkg/daemon/action/remove.go b/pkg/daemon/action/remove.go index 112d5328..bfd64f30 100644 --- a/pkg/daemon/action/remove.go +++ b/pkg/daemon/action/remove.go @@ -5,7 +5,7 @@ import ( log "github.com/sirupsen/logrus" - "github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" ) func (svr *Server) Remove(req *rpc.RemoveRequest, resp rpc.Daemon_RemoveServer) error { diff --git a/pkg/daemon/action/server.go b/pkg/daemon/action/server.go index 81e3f22b..3b2efef2 100644 --- a/pkg/daemon/action/server.go +++ b/pkg/daemon/action/server.go @@ -9,9 +9,9 @@ import ( "k8s.io/client-go/metadata/metadatainformer" "k8s.io/client-go/restmapper" - "github.com/wencaiwulue/kubevpn/pkg/config" - "github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" - "github.com/wencaiwulue/kubevpn/pkg/handler" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" + "github.com/wencaiwulue/kubevpn/v2/pkg/handler" ) type Server struct { diff --git a/pkg/daemon/action/sshdaemon.go b/pkg/daemon/action/sshdaemon.go index bdb22afd..2ec795da 100644 --- a/pkg/daemon/action/sshdaemon.go +++ b/pkg/daemon/action/sshdaemon.go @@ -10,12 +10,12 @@ import ( log "github.com/sirupsen/logrus" "k8s.io/apimachinery/pkg/util/wait" - "github.com/wencaiwulue/kubevpn/pkg/config" - "github.com/wencaiwulue/kubevpn/pkg/core" - "github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" - "github.com/wencaiwulue/kubevpn/pkg/handler" - "github.com/wencaiwulue/kubevpn/pkg/tun" - "github.com/wencaiwulue/kubevpn/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/core" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" + "github.com/wencaiwulue/kubevpn/v2/pkg/handler" + "github.com/wencaiwulue/kubevpn/v2/pkg/tun" + "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) var _, bits = config.DockerCIDR.Mask.Size() diff --git a/pkg/daemon/action/status.go b/pkg/daemon/action/status.go index 35c4703c..0fc15ba9 100644 --- a/pkg/daemon/action/status.go +++ b/pkg/daemon/action/status.go @@ -6,7 +6,7 @@ import ( "fmt" "text/tabwriter" - "github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" ) func (svr *Server) Status(ctx context.Context, request *rpc.StatusRequest) (*rpc.StatusResponse, error) { diff --git a/pkg/daemon/action/stop.go b/pkg/daemon/action/stop.go index 4a9c90b1..ee4e048d 100644 --- a/pkg/daemon/action/stop.go +++ b/pkg/daemon/action/stop.go @@ -6,7 +6,7 @@ import ( log "github.com/sirupsen/logrus" - "github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" ) func (svr *Server) Stop(req *rpc.QuitRequest, resp rpc.Daemon_QuitServer) error { diff --git a/pkg/daemon/action/upgrade.go b/pkg/daemon/action/upgrade.go index 6de63216..084599cb 100644 --- a/pkg/daemon/action/upgrade.go +++ b/pkg/daemon/action/upgrade.go @@ -6,8 +6,8 @@ import ( goversion "github.com/hashicorp/go-version" log "github.com/sirupsen/logrus" - "github.com/wencaiwulue/kubevpn/pkg/config" - "github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" ) func (svr *Server) Upgrade(ctx context.Context, req *rpc.UpgradeRequest) (*rpc.UpgradeResponse, error) { diff --git a/pkg/daemon/action/version.go b/pkg/daemon/action/version.go index 74eceec8..db7883f7 100644 --- a/pkg/daemon/action/version.go +++ b/pkg/daemon/action/version.go @@ -3,8 +3,8 @@ package action import ( "context" - "github.com/wencaiwulue/kubevpn/pkg/config" - "github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" ) func (svr *Server) Version(ctx context.Context, req *rpc.VersionRequest) (*rpc.VersionResponse, error) { diff --git a/pkg/daemon/client.go b/pkg/daemon/client.go index 5a882d25..e88b327c 100644 --- a/pkg/daemon/client.go +++ b/pkg/daemon/client.go @@ -19,9 +19,9 @@ import ( _ "google.golang.org/grpc/resolver/dns" _ "google.golang.org/grpc/resolver/passthrough" - "github.com/wencaiwulue/kubevpn/pkg/config" - "github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" - "github.com/wencaiwulue/kubevpn/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" + "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) var daemonClient, sudoDaemonClient rpc.DaemonClient diff --git a/pkg/daemon/daemon.go b/pkg/daemon/daemon.go index 2e0d17de..0de0c2b0 100644 --- a/pkg/daemon/daemon.go +++ b/pkg/daemon/daemon.go @@ -18,10 +18,10 @@ import ( "google.golang.org/grpc/reflection" "gopkg.in/natefinch/lumberjack.v2" - "github.com/wencaiwulue/kubevpn/pkg/daemon/action" - _ "github.com/wencaiwulue/kubevpn/pkg/daemon/handler" - "github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" - "github.com/wencaiwulue/kubevpn/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/action" + _ "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/handler" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" + "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) type SvrOption struct { diff --git a/pkg/daemon/handler/ssh.go b/pkg/daemon/handler/ssh.go index b00f4baf..5d588601 100644 --- a/pkg/daemon/handler/ssh.go +++ b/pkg/daemon/handler/ssh.go @@ -22,10 +22,10 @@ import ( "golang.org/x/oauth2" "k8s.io/client-go/tools/remotecommand" - "github.com/wencaiwulue/kubevpn/pkg/config" - "github.com/wencaiwulue/kubevpn/pkg/core" - "github.com/wencaiwulue/kubevpn/pkg/handler" - "github.com/wencaiwulue/kubevpn/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/core" + "github.com/wencaiwulue/kubevpn/v2/pkg/handler" + "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) type wsHandler struct { @@ -129,13 +129,13 @@ func (w *wsHandler) handle(ctx2 context.Context) { } func (w *wsHandler) portMap(ctx context.Context, conf *util.SshConfig) (localPort int, err error) { - removePort := 10800 + remotePort := 10800 localPort, err = util.GetAvailableTCPPortOrDie() if err != nil { return } var remote netip.AddrPort - remote, err = netip.ParseAddrPort(net.JoinHostPort("127.0.0.1", strconv.Itoa(removePort))) + remote, err = netip.ParseAddrPort(net.JoinHostPort("127.0.0.1", strconv.Itoa(remotePort))) if err != nil { return } diff --git a/pkg/dev/convert.go b/pkg/dev/convert.go index d7b7b974..2129e142 100644 --- a/pkg/dev/convert.go +++ b/pkg/dev/convert.go @@ -26,9 +26,9 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/kubectl/pkg/cmd/util" - "github.com/wencaiwulue/kubevpn/pkg/config" - "github.com/wencaiwulue/kubevpn/pkg/cp" - util2 "github.com/wencaiwulue/kubevpn/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/cp" + util2 "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) type RunConfig struct { diff --git a/pkg/dev/main.go b/pkg/dev/main.go index 06e8240a..41b2ac6e 100644 --- a/pkg/dev/main.go +++ b/pkg/dev/main.go @@ -44,12 +44,12 @@ import ( "k8s.io/kubectl/pkg/util/podutils" "k8s.io/utils/pointer" - "github.com/wencaiwulue/kubevpn/pkg/config" - "github.com/wencaiwulue/kubevpn/pkg/daemon" - "github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" - "github.com/wencaiwulue/kubevpn/pkg/handler" - "github.com/wencaiwulue/kubevpn/pkg/mesh" - "github.com/wencaiwulue/kubevpn/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" + "github.com/wencaiwulue/kubevpn/v2/pkg/handler" + "github.com/wencaiwulue/kubevpn/v2/pkg/mesh" + "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) type ConnectMode string diff --git a/pkg/dev/option.go b/pkg/dev/option.go index 9cc82077..fe4eb416 100644 --- a/pkg/dev/option.go +++ b/pkg/dev/option.go @@ -5,7 +5,7 @@ import ( "github.com/docker/docker/api/types/network" "github.com/pkg/errors" - "github.com/wencaiwulue/kubevpn/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) // 这里的逻辑是找到指定的容器。然后以传入的参数 tempContainerConfig 为准。即也就是用户命令行指定的参数为准。 diff --git a/pkg/dev/run.go b/pkg/dev/run.go index cbcc8ac6..044f5561 100644 --- a/pkg/dev/run.go +++ b/pkg/dev/run.go @@ -21,7 +21,7 @@ import ( log "github.com/sirupsen/logrus" "k8s.io/apimachinery/pkg/util/wait" - "github.com/wencaiwulue/kubevpn/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) func run(ctx context.Context, runConfig *RunConfig, cli *client.Client, c *command.DockerCli) (id string, err error) { diff --git a/pkg/dns/dns.go b/pkg/dns/dns.go index ab53d595..cd805a84 100644 --- a/pkg/dns/dns.go +++ b/pkg/dns/dns.go @@ -26,7 +26,7 @@ import ( v13 "k8s.io/client-go/kubernetes/typed/core/v1" "k8s.io/client-go/util/flowcontrol" - "github.com/wencaiwulue/kubevpn/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" ) type Config struct { diff --git a/pkg/dns/dns_unix.go b/pkg/dns/dns_unix.go index 764d0e3d..d1fe3d44 100644 --- a/pkg/dns/dns_unix.go +++ b/pkg/dns/dns_unix.go @@ -20,7 +20,7 @@ import ( log "github.com/sirupsen/logrus" "k8s.io/apimachinery/pkg/util/sets" - "github.com/wencaiwulue/kubevpn/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) var cancel context.CancelFunc diff --git a/pkg/driver/driver.go b/pkg/driver/driver.go index 68c716e5..f037bf21 100644 --- a/pkg/driver/driver.go +++ b/pkg/driver/driver.go @@ -8,8 +8,8 @@ import ( log "github.com/sirupsen/logrus" "k8s.io/client-go/util/retry" - "github.com/wencaiwulue/kubevpn/pkg/driver/openvpn" - "github.com/wencaiwulue/kubevpn/pkg/driver/wintun" + "github.com/wencaiwulue/kubevpn/v2/pkg/driver/openvpn" + "github.com/wencaiwulue/kubevpn/v2/pkg/driver/wintun" ) func InstallTunTapDriver() { diff --git a/pkg/exchange/controller.go b/pkg/exchange/controller.go index 1471b150..591eaa74 100644 --- a/pkg/exchange/controller.go +++ b/pkg/exchange/controller.go @@ -5,8 +5,8 @@ import ( "k8s.io/apimachinery/pkg/api/resource" "k8s.io/utils/pointer" - "github.com/wencaiwulue/kubevpn/pkg/config" - "github.com/wencaiwulue/kubevpn/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) func RemoveContainer(spec *corev1.PodSpec) { diff --git a/pkg/handler/cleaner.go b/pkg/handler/cleaner.go index f9650012..e37d9ef9 100644 --- a/pkg/handler/cleaner.go +++ b/pkg/handler/cleaner.go @@ -20,8 +20,8 @@ import ( "k8s.io/client-go/util/retry" "k8s.io/utils/pointer" - "github.com/wencaiwulue/kubevpn/pkg/config" - "github.com/wencaiwulue/kubevpn/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) func (c *ConnectOptions) addCleanUpResourceHandler() { diff --git a/pkg/handler/clone.go b/pkg/handler/clone.go index 83a4c538..726d11e1 100644 --- a/pkg/handler/clone.go +++ b/pkg/handler/clone.go @@ -35,9 +35,9 @@ import ( "k8s.io/kubectl/pkg/util/podutils" "k8s.io/utils/pointer" - "github.com/wencaiwulue/kubevpn/pkg/config" - "github.com/wencaiwulue/kubevpn/pkg/mesh" - "github.com/wencaiwulue/kubevpn/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/mesh" + "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) type CloneOptions struct { diff --git a/pkg/handler/connect.go b/pkg/handler/connect.go index dc9537fb..ee922152 100644 --- a/pkg/handler/connect.go +++ b/pkg/handler/connect.go @@ -61,12 +61,12 @@ import ( "k8s.io/utils/pointer" pkgclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/wencaiwulue/kubevpn/pkg/config" - "github.com/wencaiwulue/kubevpn/pkg/core" - "github.com/wencaiwulue/kubevpn/pkg/dns" - "github.com/wencaiwulue/kubevpn/pkg/driver" - "github.com/wencaiwulue/kubevpn/pkg/tun" - "github.com/wencaiwulue/kubevpn/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/core" + "github.com/wencaiwulue/kubevpn/v2/pkg/dns" + "github.com/wencaiwulue/kubevpn/v2/pkg/driver" + "github.com/wencaiwulue/kubevpn/v2/pkg/tun" + "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) type ConnectOptions struct { diff --git a/pkg/handler/dhcp.go b/pkg/handler/dhcp.go index 89b5679a..5965cb67 100644 --- a/pkg/handler/dhcp.go +++ b/pkg/handler/dhcp.go @@ -15,7 +15,7 @@ import ( "k8s.io/apimachinery/pkg/types" corev1 "k8s.io/client-go/kubernetes/typed/core/v1" - "github.com/wencaiwulue/kubevpn/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" ) type DHCPManager struct { diff --git a/pkg/handler/envoy.go b/pkg/handler/envoy.go index 295e6098..b40fd1dc 100644 --- a/pkg/handler/envoy.go +++ b/pkg/handler/envoy.go @@ -23,10 +23,10 @@ import ( cmdutil "k8s.io/kubectl/pkg/cmd/util" "sigs.k8s.io/yaml" - "github.com/wencaiwulue/kubevpn/pkg/config" - "github.com/wencaiwulue/kubevpn/pkg/controlplane" - "github.com/wencaiwulue/kubevpn/pkg/mesh" - "github.com/wencaiwulue/kubevpn/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/controlplane" + "github.com/wencaiwulue/kubevpn/v2/pkg/mesh" + "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) // https://istio.io/latest/docs/ops/deployment/requirements/#ports-used-by-istio diff --git a/pkg/handler/function_test.go b/pkg/handler/function_test.go index 4e4edaeb..35460c24 100644 --- a/pkg/handler/function_test.go +++ b/pkg/handler/function_test.go @@ -28,7 +28,7 @@ import ( cmdutil "k8s.io/kubectl/pkg/cmd/util" "sigs.k8s.io/yaml" - "github.com/wencaiwulue/kubevpn/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) var ( diff --git a/pkg/handler/remote.go b/pkg/handler/remote.go index 8eedb693..04a1fbbe 100644 --- a/pkg/handler/remote.go +++ b/pkg/handler/remote.go @@ -34,9 +34,9 @@ import ( "k8s.io/kubectl/pkg/util/podutils" "k8s.io/utils/pointer" - "github.com/wencaiwulue/kubevpn/pkg/config" - "github.com/wencaiwulue/kubevpn/pkg/exchange" - "github.com/wencaiwulue/kubevpn/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/exchange" + "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) func createOutboundPod(ctx context.Context, factory cmdutil.Factory, clientset *kubernetes.Clientset, namespace string) (err error) { diff --git a/pkg/handler/reset.go b/pkg/handler/reset.go index 60d94234..f4b09d9a 100644 --- a/pkg/handler/reset.go +++ b/pkg/handler/reset.go @@ -12,9 +12,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/yaml" - "github.com/wencaiwulue/kubevpn/pkg/config" - "github.com/wencaiwulue/kubevpn/pkg/controlplane" - "github.com/wencaiwulue/kubevpn/pkg/dns" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/controlplane" + "github.com/wencaiwulue/kubevpn/v2/pkg/dns" ) // Reset diff --git a/pkg/handler/serve.go b/pkg/handler/serve.go index ece27c55..feddb806 100644 --- a/pkg/handler/serve.go +++ b/pkg/handler/serve.go @@ -8,9 +8,9 @@ import ( log "github.com/sirupsen/logrus" - "github.com/wencaiwulue/kubevpn/pkg/config" - "github.com/wencaiwulue/kubevpn/pkg/core" - "github.com/wencaiwulue/kubevpn/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/core" + "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) func RentIPIfNeeded(route *core.Route) error { diff --git a/pkg/mesh/controller.go b/pkg/mesh/controller.go index 3365c8c0..e795e186 100644 --- a/pkg/mesh/controller.go +++ b/pkg/mesh/controller.go @@ -10,8 +10,8 @@ import ( "k8s.io/apimachinery/pkg/util/yaml" "k8s.io/utils/pointer" - "github.com/wencaiwulue/kubevpn/pkg/config" - "github.com/wencaiwulue/kubevpn/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) //go:embed envoy.yaml diff --git a/pkg/test/local.go b/pkg/test/local.go index 9490fae9..275e29d5 100644 --- a/pkg/test/local.go +++ b/pkg/test/local.go @@ -7,7 +7,7 @@ import ( "github.com/containernetworking/cni/pkg/types" log "github.com/sirupsen/logrus" - "github.com/wencaiwulue/kubevpn/pkg/tun" + "github.com/wencaiwulue/kubevpn/v2/pkg/tun" ) func main() { diff --git a/pkg/test/server/server.go b/pkg/test/server/server.go index 9c006f35..457d54a5 100644 --- a/pkg/test/server/server.go +++ b/pkg/test/server/server.go @@ -6,7 +6,7 @@ import ( log "github.com/sirupsen/logrus" - "github.com/wencaiwulue/kubevpn/pkg/tun" + "github.com/wencaiwulue/kubevpn/v2/pkg/tun" ) func main() { diff --git a/pkg/tun/tun.go b/pkg/tun/tun.go index 93719d8c..acb9e6c6 100644 --- a/pkg/tun/tun.go +++ b/pkg/tun/tun.go @@ -10,7 +10,7 @@ import ( "golang.zx2c4.com/wireguard/device" "golang.zx2c4.com/wireguard/tun" - "github.com/wencaiwulue/kubevpn/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" ) // Config is the config for TUN device. diff --git a/pkg/tun/tun_bsd.go b/pkg/tun/tun_bsd.go index abd6bd3c..eda95ab8 100644 --- a/pkg/tun/tun_bsd.go +++ b/pkg/tun/tun_bsd.go @@ -12,7 +12,7 @@ import ( log "github.com/sirupsen/logrus" "golang.zx2c4.com/wireguard/tun" - "github.com/wencaiwulue/kubevpn/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" ) func createTun(cfg Config) (conn net.Conn, itf *net.Interface, err error) { diff --git a/pkg/tun/tun_darwin.go b/pkg/tun/tun_darwin.go index fa3b68d7..d3a6df04 100644 --- a/pkg/tun/tun_darwin.go +++ b/pkg/tun/tun_darwin.go @@ -12,7 +12,7 @@ import ( log "github.com/sirupsen/logrus" "golang.zx2c4.com/wireguard/tun" - "github.com/wencaiwulue/kubevpn/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" ) func createTun(cfg Config) (conn net.Conn, itf *net.Interface, err error) { diff --git a/pkg/tun/tun_linux.go b/pkg/tun/tun_linux.go index 6fd3c0e3..021c9685 100644 --- a/pkg/tun/tun_linux.go +++ b/pkg/tun/tun_linux.go @@ -13,7 +13,7 @@ import ( log "github.com/sirupsen/logrus" "golang.zx2c4.com/wireguard/tun" - "github.com/wencaiwulue/kubevpn/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" ) func createTun(cfg Config) (conn net.Conn, itf *net.Interface, err error) { diff --git a/pkg/upgrade/upgrade.go b/pkg/upgrade/upgrade.go index c6869cf8..140fcffc 100644 --- a/pkg/upgrade/upgrade.go +++ b/pkg/upgrade/upgrade.go @@ -9,8 +9,8 @@ import ( goversion "github.com/hashicorp/go-version" - "github.com/wencaiwulue/kubevpn/pkg/config" - "github.com/wencaiwulue/kubevpn/pkg/util" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) // Main diff --git a/pkg/util/cidr.go b/pkg/util/cidr.go index 11d10fcc..cffc3cbb 100644 --- a/pkg/util/cidr.go +++ b/pkg/util/cidr.go @@ -12,7 +12,7 @@ import ( "k8s.io/client-go/rest" "k8s.io/utils/pointer" - "github.com/wencaiwulue/kubevpn/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" ) // GetCIDRElegant diff --git a/pkg/util/elevatecheck_others.go b/pkg/util/elevatecheck_others.go index 653eca99..72160641 100644 --- a/pkg/util/elevatecheck_others.go +++ b/pkg/util/elevatecheck_others.go @@ -15,7 +15,7 @@ import ( log "github.com/sirupsen/logrus" "k8s.io/client-go/tools/clientcmd" - "github.com/wencaiwulue/kubevpn/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" ) const envStartSudoKubeVPNByKubeVPN = config.EnvStartSudoKubeVPNByKubeVPN diff --git a/pkg/util/getcidr.go b/pkg/util/getcidr.go index 73ce836f..998c51e8 100644 --- a/pkg/util/getcidr.go +++ b/pkg/util/getcidr.go @@ -20,8 +20,9 @@ import ( corev1 "k8s.io/client-go/kubernetes/typed/core/v1" "k8s.io/client-go/rest" "k8s.io/utils/pointer" + "k8s.io/utils/ptr" - "github.com/wencaiwulue/kubevpn/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" ) // root 22008 21846 14 Jan18 ? 6-22:53:35 kube-apiserver --advertise-address=10.56.95.185 --allow-privileged=true --anonymous-auth=True --apiserver-count=3 --authorization-mode=Node,RBAC --bind-address=0.0.0.0 --client-ca-file=/etc/kubernetes/ssl/ca.crt --default-not-ready-toleration-seconds=300 --default-unreachable-toleration-seconds=300 --enable-admission-plugins=NodeRestriction --enable-aggregator-routing=False --enable-bootstrap-token-auth=true --endpoint-reconciler-type=lease --etcd-cafile=/etc/ssl/etcd/ssl/ca.pem --etcd-certfile=/etc/ssl/etcd/ssl/node-kube-control-1.pem --etcd-keyfile=/etc/ssl/etcd/ssl/node-kube-control-1-key.pem --etcd-servers=https://10.56.95.185:2379,https://10.56.95.186:2379,https://10.56.95.187:2379 --etcd-servers-overrides=/events#https://10.56.95.185:2381;https://10.56.95.186:2381;https://10.56.95.187:2381 --event-ttl=1h0m0s --insecure-port=0 --kubelet-certificate-authority=/etc/kubernetes/ssl/kubelet/kubelet-ca.crt --kubelet-client-certificate=/etc/kubernetes/ssl/apiserver-kubelet-client.crt --kubelet-client-key=/etc/kubernetes/ssl/apiserver-kubelet-client.key --kubelet-preferred-address-types=InternalDNS,InternalIP,Hostname,ExternalDNS,ExternalIP --profiling=False --proxy-client-cert-file=/etc/kubernetes/ssl/front-proxy-client.crt --proxy-client-key-file=/etc/kubernetes/ssl/front-proxy-client.key --request-timeout=1m0s --requestheader-allowed-names=front-proxy-client --requestheader-client-ca-file=/etc/kubernetes/ssl/front-proxy-ca.crt --requestheader-extra-headers-prefix=X-Remote-Extra- --requestheader-group-headers=X-Remote-Group --requestheader-username-headers=X-Remote-User --secure-port=6443 --service-account-issuer=https://kubernetes.default.svc.cluster.local --service-account-key-file=/etc/kubernetes/ssl/sa.pub --service-account-signing-key-file=/etc/kubernetes/ssl/sa.key --service-cluster-ip-range=10.233.0.0/18 --service-node-port-range=30000-32767 --storage-backend=etcd3 --tls-cert-file=/etc/kubernetes/ssl/apiserver.crt --tls-private-key-file=/etc/kubernetes/ssl/apiserver.key @@ -168,7 +169,7 @@ func createCIDRPod(clientset *kubernetes.Clientset, namespace string) (*v12.Pod, VolumeSource: v12.VolumeSource{ HostPath: &v12.HostPathVolumeSource{ Path: config.DefaultNetDir, - Type: (*v12.HostPathType)(pointer.String(string(v12.HostPathDirectoryOrCreate))), + Type: ptr.To[v12.HostPathType](v12.HostPathDirectoryOrCreate), }, }, }, @@ -177,7 +178,7 @@ func createCIDRPod(clientset *kubernetes.Clientset, namespace string) (*v12.Pod, VolumeSource: v12.VolumeSource{ HostPath: &v12.HostPathVolumeSource{ Path: config.Proc, - Type: (*v12.HostPathType)(pointer.String(string(v12.HostPathDirectoryOrCreate))), + Type: ptr.To[v12.HostPathType](v12.HostPathDirectoryOrCreate), }, }, }, diff --git a/pkg/util/net.go b/pkg/util/net.go index 55aa290c..b533946c 100644 --- a/pkg/util/net.go +++ b/pkg/util/net.go @@ -10,7 +10,7 @@ import ( "github.com/cilium/ipam/service/ipallocator" "github.com/prometheus-community/pro-bing" - "github.com/wencaiwulue/kubevpn/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" ) func GetTunDevice(ips ...net.IP) (*net.Interface, error) { diff --git a/pkg/util/networkpolicy_windows.go b/pkg/util/networkpolicy_windows.go index 912b19ac..e4d1b8b3 100644 --- a/pkg/util/networkpolicy_windows.go +++ b/pkg/util/networkpolicy_windows.go @@ -11,7 +11,7 @@ import ( log "github.com/sirupsen/logrus" "golang.org/x/text/encoding/simplifiedchinese" - "github.com/wencaiwulue/kubevpn/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" ) // DeleteBlockFirewallRule Delete all action block firewall rule diff --git a/pkg/util/ns.go b/pkg/util/ns.go index 84120d7c..3f85129f 100644 --- a/pkg/util/ns.go +++ b/pkg/util/ns.go @@ -13,7 +13,7 @@ import ( "k8s.io/client-go/tools/clientcmd/api/latest" cmdutil "k8s.io/kubectl/pkg/cmd/util" - "github.com/wencaiwulue/kubevpn/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" ) func GetClusterId(client v12.ConfigMapInterface) (types.UID, error) { diff --git a/pkg/util/pod.go b/pkg/util/pod.go index 768e87cb..958a2fe0 100644 --- a/pkg/util/pod.go +++ b/pkg/util/pod.go @@ -36,7 +36,7 @@ import ( "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/util/podutils" - "github.com/wencaiwulue/kubevpn/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" ) type PodRouteConfig struct { diff --git a/pkg/util/ssh.go b/pkg/util/ssh.go index c366957d..ab1bcd27 100644 --- a/pkg/util/ssh.go +++ b/pkg/util/ssh.go @@ -20,7 +20,7 @@ import ( "golang.org/x/crypto/ssh" "k8s.io/client-go/util/homedir" - "github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" + "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" ) type SshConfig struct { diff --git a/pkg/util/upgarde.go b/pkg/util/upgarde.go index 7d62f980..ca8bf89c 100644 --- a/pkg/util/upgarde.go +++ b/pkg/util/upgarde.go @@ -23,6 +23,10 @@ var ( } ) +const ( + addr = "https://github.com/wencaiwulue/kubevpn/releases/latest" +) + func GetManifest(httpCli *http.Client, os string, arch string) (version string, commit string, url string, err error) { var resp *http.Response var errs []error @@ -72,8 +76,7 @@ func GetManifest(httpCli *http.Client, os string, arch string) (version string, } if !found { - u := "https://github.com/wencaiwulue/kubevpn/releases/latest" - err = fmt.Errorf("Can not found latest version url of KubeVPN, you can download it manually: \n%s\n", u) + err = fmt.Errorf("Can not found latest version url of KubeVPN, you can download it manually: \n%s\n", addr) return } } diff --git a/pkg/util/util.go b/pkg/util/util.go index 89c0a38b..1931b023 100644 --- a/pkg/util/util.go +++ b/pkg/util/util.go @@ -35,8 +35,8 @@ import ( cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/polymorphichelpers" - "github.com/wencaiwulue/kubevpn/pkg/config" - "github.com/wencaiwulue/kubevpn/pkg/driver" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/driver" ) func GetAvailableUDPPortOrDie() (int, error) { diff --git a/pkg/webhook/dhcp.go b/pkg/webhook/dhcp.go index a1c0eab8..c91029aa 100644 --- a/pkg/webhook/dhcp.go +++ b/pkg/webhook/dhcp.go @@ -10,8 +10,8 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/kubectl/pkg/cmd/util" - "github.com/wencaiwulue/kubevpn/pkg/config" - "github.com/wencaiwulue/kubevpn/pkg/handler" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/handler" ) type dhcpServer struct { diff --git a/pkg/webhook/mutateadmissionwebhook.go b/pkg/webhook/mutateadmissionwebhook.go index f49af64b..2af1f225 100644 --- a/pkg/webhook/mutateadmissionwebhook.go +++ b/pkg/webhook/mutateadmissionwebhook.go @@ -15,7 +15,7 @@ import ( "k8s.io/client-go/kubernetes" cmdutil "k8s.io/kubectl/pkg/cmd/util" - "github.com/wencaiwulue/kubevpn/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" ) // admissionReviewHandler is a handler to handle business logic, holding an util.Factory diff --git a/pkg/webhook/pods.go b/pkg/webhook/pods.go index cbcd4e57..a632e3fe 100644 --- a/pkg/webhook/pods.go +++ b/pkg/webhook/pods.go @@ -15,8 +15,8 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/kubectl/pkg/cmd/util/podcmd" - "github.com/wencaiwulue/kubevpn/pkg/config" - "github.com/wencaiwulue/kubevpn/pkg/handler" + "github.com/wencaiwulue/kubevpn/v2/pkg/config" + "github.com/wencaiwulue/kubevpn/v2/pkg/handler" ) // only allow pods to pull images from specific registry.