apps/kubevpn
1
0
Fork 0
mirror of https://github.com/kubenetworks/kubevpn.git synced 2025-10-05 15:26:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: update go mod to v2 (#127)

Browse Source 
* feat: update go mod to v2

* feat: typo
This commit is contained in:
naison
2024-01-14 18:00:12 +08:00
committed by GitHub
parent 988c2e7fdc
commit 847c2c8cc1
97 changed files with 220 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -8,7 +8,7 @@ GOARCH := $(shell go env GOHOSTARCH)
TARGET := kubevpn-${GOOS}-${GOARCH} TARGET := kubevpn-${GOOS}-${GOARCH}
OS_ARCH := ${GOOS}/${GOARCH} OS_ARCH := ${GOOS}/${GOARCH}
BASE := github.com/wencaiwulue/kubevpn BASE := github.com/wencaiwulue/kubevpn/v2
FOLDER := ${BASE}/cmd/kubevpn FOLDER := ${BASE}/cmd/kubevpn
BUILD_DIR := ./build BUILD_DIR := ./build
OUTPUT_DIR := ./bin OUTPUT_DIR := ./bin
@@ -97,7 +97,7 @@ container-test: kubevpn-linux-amd64
.PHONY: version .PHONY: version
version: version:
go run github.com/wencaiwulue/kubevpn/pkg/util/krew go run ${BASE}/pkg/util/krew
.PHONY: gen .PHONY: gen
gen: gen:

10
cmd/kubevpn/cmds/clone.go
View File

@@ -14,11 +14,11 @@ import (
"k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/templates"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
"github.com/wencaiwulue/kubevpn/pkg/daemon" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon"
"github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc"
"github.com/wencaiwulue/kubevpn/pkg/handler" "github.com/wencaiwulue/kubevpn/v2/pkg/handler"
"github.com/wencaiwulue/kubevpn/pkg/util" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
// CmdClone multiple cluster operate, can start up one deployment to another cluster // CmdClone multiple cluster operate, can start up one deployment to another cluster

6
cmd/kubevpn/cmds/config.go
View File

@@ -9,9 +9,9 @@ import (
"k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/templates"
"github.com/wencaiwulue/kubevpn/pkg/daemon" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon"
"github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc"
"github.com/wencaiwulue/kubevpn/pkg/util" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
func CmdConfig(f cmdutil.Factory) *cobra.Command { func CmdConfig(f cmdutil.Factory) *cobra.Command {

10
cmd/kubevpn/cmds/connect.go
View File

@@ -13,11 +13,11 @@ import (
"k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/templates"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
"github.com/wencaiwulue/kubevpn/pkg/daemon" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon"
"github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc"
"github.com/wencaiwulue/kubevpn/pkg/handler" "github.com/wencaiwulue/kubevpn/v2/pkg/handler"
"github.com/wencaiwulue/kubevpn/pkg/util" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
func CmdConnect(f cmdutil.Factory) *cobra.Command { func CmdConnect(f cmdutil.Factory) *cobra.Command {

6
cmd/kubevpn/cmds/controlplane.go
View File

@@ -5,9 +5,9 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
cmdutil "k8s.io/kubectl/pkg/cmd/util" cmdutil "k8s.io/kubectl/pkg/cmd/util"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
"github.com/wencaiwulue/kubevpn/pkg/controlplane" "github.com/wencaiwulue/kubevpn/v2/pkg/controlplane"
"github.com/wencaiwulue/kubevpn/pkg/util" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
func CmdControlPlane(_ cmdutil.Factory) *cobra.Command { func CmdControlPlane(_ cmdutil.Factory) *cobra.Command {

6
cmd/kubevpn/cmds/cp.go
View File

@@ -12,9 +12,9 @@ import (
"k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/templates"
"github.com/wencaiwulue/kubevpn/pkg/cp" "github.com/wencaiwulue/kubevpn/v2/pkg/cp"
"github.com/wencaiwulue/kubevpn/pkg/handler" "github.com/wencaiwulue/kubevpn/v2/pkg/handler"
"github.com/wencaiwulue/kubevpn/pkg/util" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
var cpExample = templates.Examples(i18n.T(` var cpExample = templates.Examples(i18n.T(`

2
cmd/kubevpn/cmds/daemon.go
View File

@@ -9,7 +9,7 @@ import (
cmdutil "k8s.io/kubectl/pkg/cmd/util" cmdutil "k8s.io/kubectl/pkg/cmd/util"
"k8s.io/kubectl/pkg/util/i18n" "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 { func CmdDaemon(_ cmdutil.Factory) *cobra.Command {

10
cmd/kubevpn/cmds/dev.go
View File

@@ -13,11 +13,11 @@ import (
"k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/templates"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
"github.com/wencaiwulue/kubevpn/pkg/daemon" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon"
"github.com/wencaiwulue/kubevpn/pkg/dev" "github.com/wencaiwulue/kubevpn/v2/pkg/dev"
"github.com/wencaiwulue/kubevpn/pkg/handler" "github.com/wencaiwulue/kubevpn/v2/pkg/handler"
"github.com/wencaiwulue/kubevpn/pkg/util" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
func CmdDev(f cmdutil.Factory) *cobra.Command { func CmdDev(f cmdutil.Factory) *cobra.Command {

4
cmd/kubevpn/cmds/disconnect.go
View File

@@ -14,8 +14,8 @@ import (
"k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/templates"
"k8s.io/utils/pointer" "k8s.io/utils/pointer"
"github.com/wencaiwulue/kubevpn/pkg/daemon" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon"
"github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc"
) )
func CmdDisconnect(f cmdutil.Factory) *cobra.Command { func CmdDisconnect(f cmdutil.Factory) *cobra.Command {

4
cmd/kubevpn/cmds/get.go
View File

@@ -10,8 +10,8 @@ import (
"k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/templates"
"sigs.k8s.io/yaml" "sigs.k8s.io/yaml"
"github.com/wencaiwulue/kubevpn/pkg/daemon" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon"
"github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc"
) )
func CmdGet(f cmdutil.Factory) *cobra.Command { func CmdGet(f cmdutil.Factory) *cobra.Command {

4
cmd/kubevpn/cmds/leave.go
View File

@@ -12,8 +12,8 @@ import (
"k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/templates"
"github.com/wencaiwulue/kubevpn/pkg/daemon" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon"
"github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc"
) )
func CmdLeave(f cmdutil.Factory) *cobra.Command { func CmdLeave(f cmdutil.Factory) *cobra.Command {

4
cmd/kubevpn/cmds/list.go
View File

@@ -8,8 +8,8 @@ import (
"k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/templates"
"github.com/wencaiwulue/kubevpn/pkg/daemon" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon"
"github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc"
) )
func CmdList(f cmdutil.Factory) *cobra.Command { func CmdList(f cmdutil.Factory) *cobra.Command {

4
cmd/kubevpn/cmds/logs.go
View File

@@ -12,8 +12,8 @@ import (
"k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/templates"
"github.com/wencaiwulue/kubevpn/pkg/daemon" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon"
"github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc"
) )
func CmdLogs(f cmdutil.Factory) *cobra.Command { func CmdLogs(f cmdutil.Factory) *cobra.Command {

10
cmd/kubevpn/cmds/proxy.go
View File

@@ -15,11 +15,11 @@ import (
"k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/templates"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
"github.com/wencaiwulue/kubevpn/pkg/daemon" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon"
"github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc"
"github.com/wencaiwulue/kubevpn/pkg/handler" "github.com/wencaiwulue/kubevpn/v2/pkg/handler"
"github.com/wencaiwulue/kubevpn/pkg/util" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
func CmdProxy(f cmdutil.Factory) *cobra.Command { func CmdProxy(f cmdutil.Factory) *cobra.Command {

4
cmd/kubevpn/cmds/quit.go
View File

@@ -13,8 +13,8 @@ import (
"k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/templates"
"github.com/wencaiwulue/kubevpn/pkg/daemon" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon"
"github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc"
) )
func CmdQuit(f cmdutil.Factory) *cobra.Command { func CmdQuit(f cmdutil.Factory) *cobra.Command {

4
cmd/kubevpn/cmds/remove.go
View File

@@ -12,8 +12,8 @@ import (
"k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/templates"
"github.com/wencaiwulue/kubevpn/pkg/daemon" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon"
"github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc"
) )
func CmdRemove(f cmdutil.Factory) *cobra.Command { func CmdRemove(f cmdutil.Factory) *cobra.Command {

4
cmd/kubevpn/cmds/reset.go
View File

@@ -10,8 +10,8 @@ import (
"k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/templates"
"github.com/wencaiwulue/kubevpn/pkg/handler" "github.com/wencaiwulue/kubevpn/v2/pkg/handler"
"github.com/wencaiwulue/kubevpn/pkg/util" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
func CmdReset(factory cmdutil.Factory) *cobra.Command { func CmdReset(factory cmdutil.Factory) *cobra.Command {

2
cmd/kubevpn/cmds/root.go
View File

@@ -12,7 +12,7 @@ import (
"k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/templates"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
) )
func NewKubeVPNCommand() *cobra.Command { func NewKubeVPNCommand() *cobra.Command {

8
cmd/kubevpn/cmds/serve.go
View File

@@ -12,10 +12,10 @@ import (
"k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/templates"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
"github.com/wencaiwulue/kubevpn/pkg/core" "github.com/wencaiwulue/kubevpn/v2/pkg/core"
"github.com/wencaiwulue/kubevpn/pkg/handler" "github.com/wencaiwulue/kubevpn/v2/pkg/handler"
"github.com/wencaiwulue/kubevpn/pkg/util" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
func CmdServe(_ cmdutil.Factory) *cobra.Command { func CmdServe(_ cmdutil.Factory) *cobra.Command {

4
cmd/kubevpn/cmds/ssh.go
View File

@@ -18,8 +18,8 @@ import (
"k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/templates"
"k8s.io/kubectl/pkg/util/term" "k8s.io/kubectl/pkg/util/term"
"github.com/wencaiwulue/kubevpn/pkg/daemon" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon"
"github.com/wencaiwulue/kubevpn/pkg/util" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
// CmdSSH // CmdSSH

4
cmd/kubevpn/cmds/sshdaemon.go
View File

@@ -9,8 +9,8 @@ import (
"k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/templates"
"github.com/wencaiwulue/kubevpn/pkg/daemon" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon"
"github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc"
) )
// CmdSSHDaemon // CmdSSHDaemon

4
cmd/kubevpn/cmds/status.go
View File

@@ -9,8 +9,8 @@ import (
"k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/templates"
"github.com/wencaiwulue/kubevpn/pkg/daemon" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon"
"github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc"
) )
func CmdStatus(f cmdutil.Factory) *cobra.Command { func CmdStatus(f cmdutil.Factory) *cobra.Command {

10
cmd/kubevpn/cmds/upgrade.go
View File

@@ -11,11 +11,11 @@ import (
"golang.org/x/oauth2" "golang.org/x/oauth2"
cmdutil "k8s.io/kubectl/pkg/cmd/util" cmdutil "k8s.io/kubectl/pkg/cmd/util"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
"github.com/wencaiwulue/kubevpn/pkg/daemon" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon"
"github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc"
"github.com/wencaiwulue/kubevpn/pkg/upgrade" "github.com/wencaiwulue/kubevpn/v2/pkg/upgrade"
"github.com/wencaiwulue/kubevpn/pkg/util" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
func CmdUpgrade(_ cmdutil.Factory) *cobra.Command { func CmdUpgrade(_ cmdutil.Factory) *cobra.Command {

6
cmd/kubevpn/cmds/version.go
View File

@@ -10,9 +10,9 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
cmdutil "k8s.io/kubectl/pkg/cmd/util" cmdutil "k8s.io/kubectl/pkg/cmd/util"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
"github.com/wencaiwulue/kubevpn/pkg/daemon" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon"
"github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc"
) )
// --ldflags -X // --ldflags -X

4
cmd/kubevpn/cmds/webhook.go
View File

@@ -4,8 +4,8 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
cmdutil "k8s.io/kubectl/pkg/cmd/util" cmdutil "k8s.io/kubectl/pkg/cmd/util"
"github.com/wencaiwulue/kubevpn/pkg/util" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
"github.com/wencaiwulue/kubevpn/pkg/webhook" "github.com/wencaiwulue/kubevpn/v2/pkg/webhook"
) )
func CmdWebhook(f cmdutil.Factory) *cobra.Command { func CmdWebhook(f cmdutil.Factory) *cobra.Command {

2
cmd/kubevpn/main.go
View File

@@ -6,7 +6,7 @@ import (
_ "k8s.io/client-go/plugin/pkg/client/auth" _ "k8s.io/client-go/plugin/pkg/client/auth"
_ "net/http/pprof" _ "net/http/pprof"
"github.com/wencaiwulue/kubevpn/cmd/kubevpn/cmds" "github.com/wencaiwulue/kubevpn/v2/cmd/kubevpn/cmds"
) )
func main() { func main() {

2
go.mod
View File

@@ -1,4 +1,4 @@
module github.com/wencaiwulue/kubevpn module github.com/wencaiwulue/kubevpn/v2
go 1.20 go 1.20

2
pkg/core/gvisortcpforwarder.go
View File

@@ -15,7 +15,7 @@ import (
"gvisor.dev/gvisor/pkg/tcpip/transport/tcp" "gvisor.dev/gvisor/pkg/tcpip/transport/tcp"
"gvisor.dev/gvisor/pkg/waiter" "gvisor.dev/gvisor/pkg/waiter"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
) )
var GvisorTCPForwardAddr string var GvisorTCPForwardAddr string

2
pkg/core/gvisortcphandler.go
View File

@@ -10,7 +10,7 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
) )
type gvisorTCPTunnelConnector struct { type gvisorTCPTunnelConnector struct {

2
pkg/core/gvisorudpforwarder.go
View File

@@ -11,7 +11,7 @@ import (
"gvisor.dev/gvisor/pkg/tcpip/transport/udp" "gvisor.dev/gvisor/pkg/tcpip/transport/udp"
"gvisor.dev/gvisor/pkg/waiter" "gvisor.dev/gvisor/pkg/waiter"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
) )
var GvisorUDPForwardAddr string var GvisorUDPForwardAddr string

2
pkg/core/gvisorudphandler.go
View File

@@ -9,7 +9,7 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"gvisor.dev/gvisor/pkg/tcpip/stack" "gvisor.dev/gvisor/pkg/tcpip/stack"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
) )
type gvisorUDPOverTCPTunnelConnector struct { type gvisorUDPOverTCPTunnelConnector struct {

4
pkg/core/route.go
View File

@@ -11,8 +11,8 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
"github.com/wencaiwulue/kubevpn/pkg/tun" "github.com/wencaiwulue/kubevpn/v2/pkg/tun"
) )
var ( var (

2
pkg/core/tcp.go
View File

@@ -4,7 +4,7 @@ import (
"context" "context"
"net" "net"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
) )
type tcpTransporter struct{} type tcpTransporter struct{}

4
pkg/core/tcphandler.go
View File

@@ -8,8 +8,8 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
"github.com/wencaiwulue/kubevpn/pkg/util" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
type fakeUDPTunnelConnector struct { type fakeUDPTunnelConnector struct {

2
pkg/core/tunendpoint.go
View File

@@ -16,7 +16,7 @@ import (
"gvisor.dev/gvisor/pkg/tcpip/stack" "gvisor.dev/gvisor/pkg/tcpip/stack"
"gvisor.dev/gvisor/pkg/tcpip/transport/tcp" "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) var _ stack.LinkEndpoint = (*tunEndpoint)(nil)

4
pkg/core/tunhandler.go
View File

@@ -13,8 +13,8 @@ import (
"github.com/google/gopacket/layers" "github.com/google/gopacket/layers"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
"github.com/wencaiwulue/kubevpn/pkg/util" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
const ( const (

2
pkg/core/tunhandlerclient.go
View File

@@ -8,7 +8,7 @@ import (
log "github.com/sirupsen/logrus" 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) { func (h *tunHandler) HandleClient(ctx context.Context, tun net.Conn) {

2
pkg/core/udpovertcp.go
View File

@@ -6,7 +6,7 @@ import (
"io" "io"
"net" "net"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
) )
type datagramPacket struct { type datagramPacket struct {

8
pkg/daemon/action/clone.go
View File

@@ -9,10 +9,10 @@ import (
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"
"google.golang.org/grpc/status" "google.golang.org/grpc/status"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
"github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc"
"github.com/wencaiwulue/kubevpn/pkg/handler" "github.com/wencaiwulue/kubevpn/v2/pkg/handler"
"github.com/wencaiwulue/kubevpn/pkg/util" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
func (svr *Server) Clone(req *rpc.CloneRequest, resp rpc.Daemon_CloneServer) error { func (svr *Server) Clone(req *rpc.CloneRequest, resp rpc.Daemon_CloneServer) error {

6
pkg/daemon/action/config.go
View File

@@ -4,10 +4,10 @@ import (
"context" "context"
"github.com/spf13/pflag" "github.com/spf13/pflag"
"github.com/wencaiwulue/kubevpn/pkg/handler" "github.com/wencaiwulue/kubevpn/v2/pkg/handler"
"github.com/wencaiwulue/kubevpn/pkg/util" "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) var CancelFunc = make(map[string]context.CancelFunc)

8
pkg/daemon/action/connect-fork.go
View File

@@ -10,10 +10,10 @@ import (
"github.com/spf13/pflag" "github.com/spf13/pflag"
"k8s.io/utils/pointer" "k8s.io/utils/pointer"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
"github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc"
"github.com/wencaiwulue/kubevpn/pkg/handler" "github.com/wencaiwulue/kubevpn/v2/pkg/handler"
"github.com/wencaiwulue/kubevpn/pkg/util" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
func (svr *Server) ConnectFork(req *rpc.ConnectRequest, resp rpc.Daemon_ConnectForkServer) error { func (svr *Server) ConnectFork(req *rpc.ConnectRequest, resp rpc.Daemon_ConnectForkServer) error {

8
pkg/daemon/action/connect.go
View File

@@ -19,10 +19,10 @@ import (
cmdutil "k8s.io/kubectl/pkg/cmd/util" cmdutil "k8s.io/kubectl/pkg/cmd/util"
"k8s.io/utils/pointer" "k8s.io/utils/pointer"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
"github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc"
"github.com/wencaiwulue/kubevpn/pkg/handler" "github.com/wencaiwulue/kubevpn/v2/pkg/handler"
"github.com/wencaiwulue/kubevpn/pkg/util" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
func (svr *Server) Connect(req *rpc.ConnectRequest, resp rpc.Daemon_ConnectServer) error { func (svr *Server) Connect(req *rpc.ConnectRequest, resp rpc.Daemon_ConnectServer) error {

4
pkg/daemon/action/disconnect.go
View File

@@ -7,8 +7,8 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc"
"github.com/wencaiwulue/kubevpn/pkg/dns" "github.com/wencaiwulue/kubevpn/v2/pkg/dns"
) )
func (svr *Server) Disconnect(req *rpc.DisconnectRequest, resp rpc.Daemon_DisconnectServer) error { func (svr *Server) Disconnect(req *rpc.DisconnectRequest, resp rpc.Daemon_DisconnectServer) error {

2
pkg/daemon/action/get.go
View File

@@ -14,7 +14,7 @@ import (
"k8s.io/client-go/metadata/metadatainformer" "k8s.io/client-go/metadata/metadatainformer"
"k8s.io/client-go/restmapper" "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) { func (svr *Server) Get(ctx context.Context, req *rpc.GetRequest) (*rpc.GetResponse, error) {

4
pkg/daemon/action/leave.go
View File

@@ -6,8 +6,8 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc"
"github.com/wencaiwulue/kubevpn/pkg/handler" "github.com/wencaiwulue/kubevpn/v2/pkg/handler"
) )
func (svr *Server) Leave(req *rpc.LeaveRequest, resp rpc.Daemon_LeaveServer) error { func (svr *Server) Leave(req *rpc.LeaveRequest, resp rpc.Daemon_LeaveServer) error {

6
pkg/daemon/action/list.go
View File

@@ -9,9 +9,9 @@ import (
"k8s.io/apimachinery/pkg/util/yaml" "k8s.io/apimachinery/pkg/util/yaml"
k8syaml "sigs.k8s.io/yaml" k8syaml "sigs.k8s.io/yaml"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
"github.com/wencaiwulue/kubevpn/pkg/controlplane" "github.com/wencaiwulue/kubevpn/v2/pkg/controlplane"
"github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc"
) )
func (svr *Server) List(ctx context.Context, req *rpc.ListRequest) (*rpc.ListResponse, error) { func (svr *Server) List(ctx context.Context, req *rpc.ListRequest) (*rpc.ListResponse, error) {

2
pkg/daemon/action/logs.go
View File

@@ -3,7 +3,7 @@ package action
import ( import (
"github.com/hpcloud/tail" "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 { func (svr *Server) Logs(req *rpc.LogRequest, resp rpc.Daemon_LogsServer) error {

8
pkg/daemon/action/proxy.go
View File

@@ -8,10 +8,10 @@ import (
"github.com/spf13/pflag" "github.com/spf13/pflag"
"k8s.io/utils/pointer" "k8s.io/utils/pointer"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
"github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc"
"github.com/wencaiwulue/kubevpn/pkg/handler" "github.com/wencaiwulue/kubevpn/v2/pkg/handler"
"github.com/wencaiwulue/kubevpn/pkg/util" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
// Proxy // Proxy

4
pkg/daemon/action/quit.go
View File

@@ -5,8 +5,8 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc"
"github.com/wencaiwulue/kubevpn/pkg/dns" "github.com/wencaiwulue/kubevpn/v2/pkg/dns"
) )
func (svr *Server) Quit(req *rpc.QuitRequest, resp rpc.Daemon_QuitServer) error { func (svr *Server) Quit(req *rpc.QuitRequest, resp rpc.Daemon_QuitServer) error {

2
pkg/daemon/action/remove.go
View File

@@ -5,7 +5,7 @@ import (
log "github.com/sirupsen/logrus" 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 { func (svr *Server) Remove(req *rpc.RemoveRequest, resp rpc.Daemon_RemoveServer) error {

6
pkg/daemon/action/server.go
View File

@@ -9,9 +9,9 @@ import (
"k8s.io/client-go/metadata/metadatainformer" "k8s.io/client-go/metadata/metadatainformer"
"k8s.io/client-go/restmapper" "k8s.io/client-go/restmapper"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
"github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc"
"github.com/wencaiwulue/kubevpn/pkg/handler" "github.com/wencaiwulue/kubevpn/v2/pkg/handler"
) )
type Server struct { type Server struct {

12
pkg/daemon/action/sshdaemon.go
View File

@@ -10,12 +10,12 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
"github.com/wencaiwulue/kubevpn/pkg/core" "github.com/wencaiwulue/kubevpn/v2/pkg/core"
"github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc"
"github.com/wencaiwulue/kubevpn/pkg/handler" "github.com/wencaiwulue/kubevpn/v2/pkg/handler"
"github.com/wencaiwulue/kubevpn/pkg/tun" "github.com/wencaiwulue/kubevpn/v2/pkg/tun"
"github.com/wencaiwulue/kubevpn/pkg/util" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
var _, bits = config.DockerCIDR.Mask.Size() var _, bits = config.DockerCIDR.Mask.Size()

2
pkg/daemon/action/status.go
View File

@@ -6,7 +6,7 @@ import (
"fmt" "fmt"
"text/tabwriter" "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) { func (svr *Server) Status(ctx context.Context, request *rpc.StatusRequest) (*rpc.StatusResponse, error) {

2
pkg/daemon/action/stop.go
View File

@@ -6,7 +6,7 @@ import (
log "github.com/sirupsen/logrus" 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 { func (svr *Server) Stop(req *rpc.QuitRequest, resp rpc.Daemon_QuitServer) error {

4
pkg/daemon/action/upgrade.go
View File

@@ -6,8 +6,8 @@ import (
goversion "github.com/hashicorp/go-version" goversion "github.com/hashicorp/go-version"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
"github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc"
) )
func (svr *Server) Upgrade(ctx context.Context, req *rpc.UpgradeRequest) (*rpc.UpgradeResponse, error) { func (svr *Server) Upgrade(ctx context.Context, req *rpc.UpgradeRequest) (*rpc.UpgradeResponse, error) {

4
pkg/daemon/action/version.go
View File

@@ -3,8 +3,8 @@ package action
import ( import (
"context" "context"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
"github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc"
) )
func (svr *Server) Version(ctx context.Context, req *rpc.VersionRequest) (*rpc.VersionResponse, error) { func (svr *Server) Version(ctx context.Context, req *rpc.VersionRequest) (*rpc.VersionResponse, error) {

6
pkg/daemon/client.go
View File

@@ -19,9 +19,9 @@ import (
_ "google.golang.org/grpc/resolver/dns" _ "google.golang.org/grpc/resolver/dns"
_ "google.golang.org/grpc/resolver/passthrough" _ "google.golang.org/grpc/resolver/passthrough"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
"github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc"
"github.com/wencaiwulue/kubevpn/pkg/util" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
var daemonClient, sudoDaemonClient rpc.DaemonClient var daemonClient, sudoDaemonClient rpc.DaemonClient

8
pkg/daemon/daemon.go
View File

@@ -18,10 +18,10 @@ import (
"google.golang.org/grpc/reflection" "google.golang.org/grpc/reflection"
"gopkg.in/natefinch/lumberjack.v2" "gopkg.in/natefinch/lumberjack.v2"
"github.com/wencaiwulue/kubevpn/pkg/daemon/action" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/action"
_ "github.com/wencaiwulue/kubevpn/pkg/daemon/handler" _ "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/handler"
"github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc"
"github.com/wencaiwulue/kubevpn/pkg/util" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
type SvrOption struct { type SvrOption struct {

12
pkg/daemon/handler/ssh.go
View File

@@ -22,10 +22,10 @@ import (
"golang.org/x/oauth2" "golang.org/x/oauth2"
"k8s.io/client-go/tools/remotecommand" "k8s.io/client-go/tools/remotecommand"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
"github.com/wencaiwulue/kubevpn/pkg/core" "github.com/wencaiwulue/kubevpn/v2/pkg/core"
"github.com/wencaiwulue/kubevpn/pkg/handler" "github.com/wencaiwulue/kubevpn/v2/pkg/handler"
"github.com/wencaiwulue/kubevpn/pkg/util" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
type wsHandler struct { 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) { func (w *wsHandler) portMap(ctx context.Context, conf *util.SshConfig) (localPort int, err error) {
removePort := 10800 remotePort := 10800
localPort, err = util.GetAvailableTCPPortOrDie() localPort, err = util.GetAvailableTCPPortOrDie()
if err != nil { if err != nil {
return return
} }
var remote netip.AddrPort 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 { if err != nil {
return return
} }

6
pkg/dev/convert.go
View File

@@ -26,9 +26,9 @@ import (
"k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/cmd/util"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
"github.com/wencaiwulue/kubevpn/pkg/cp" "github.com/wencaiwulue/kubevpn/v2/pkg/cp"
util2 "github.com/wencaiwulue/kubevpn/pkg/util" util2 "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
type RunConfig struct { type RunConfig struct {

12
pkg/dev/main.go
View File

@@ -44,12 +44,12 @@ import (
"k8s.io/kubectl/pkg/util/podutils" "k8s.io/kubectl/pkg/util/podutils"
"k8s.io/utils/pointer" "k8s.io/utils/pointer"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
"github.com/wencaiwulue/kubevpn/pkg/daemon" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon"
"github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc"
"github.com/wencaiwulue/kubevpn/pkg/handler" "github.com/wencaiwulue/kubevpn/v2/pkg/handler"
"github.com/wencaiwulue/kubevpn/pkg/mesh" "github.com/wencaiwulue/kubevpn/v2/pkg/mesh"
"github.com/wencaiwulue/kubevpn/pkg/util" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
type ConnectMode string type ConnectMode string

2
pkg/dev/option.go
View File

@@ -5,7 +5,7 @@ import (
"github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/network"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/wencaiwulue/kubevpn/pkg/util" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
// 这里的逻辑是找到指定的容器。然后以传入的参数 tempContainerConfig 为准。即也就是用户命令行指定的参数为准。 // 这里的逻辑是找到指定的容器。然后以传入的参数 tempContainerConfig 为准。即也就是用户命令行指定的参数为准。

2
pkg/dev/run.go
View File

@@ -21,7 +21,7 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"k8s.io/apimachinery/pkg/util/wait" "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) { func run(ctx context.Context, runConfig *RunConfig, cli *client.Client, c *command.DockerCli) (id string, err error) {

2
pkg/dns/dns.go
View File

@@ -26,7 +26,7 @@ import (
v13 "k8s.io/client-go/kubernetes/typed/core/v1" v13 "k8s.io/client-go/kubernetes/typed/core/v1"
"k8s.io/client-go/util/flowcontrol" "k8s.io/client-go/util/flowcontrol"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
) )
type Config struct { type Config struct {

2
pkg/dns/dns_unix.go
View File

@@ -20,7 +20,7 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
"github.com/wencaiwulue/kubevpn/pkg/util" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
var cancel context.CancelFunc var cancel context.CancelFunc

4
pkg/driver/driver.go
View File

@@ -8,8 +8,8 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"k8s.io/client-go/util/retry" "k8s.io/client-go/util/retry"
"github.com/wencaiwulue/kubevpn/pkg/driver/openvpn" "github.com/wencaiwulue/kubevpn/v2/pkg/driver/openvpn"
"github.com/wencaiwulue/kubevpn/pkg/driver/wintun" "github.com/wencaiwulue/kubevpn/v2/pkg/driver/wintun"
) )
func InstallTunTapDriver() { func InstallTunTapDriver() {

4
pkg/exchange/controller.go
View File

@@ -5,8 +5,8 @@ import (
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
"k8s.io/utils/pointer" "k8s.io/utils/pointer"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
"github.com/wencaiwulue/kubevpn/pkg/util" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
func RemoveContainer(spec *corev1.PodSpec) { func RemoveContainer(spec *corev1.PodSpec) {

4
pkg/handler/cleaner.go
View File

@@ -20,8 +20,8 @@ import (
"k8s.io/client-go/util/retry" "k8s.io/client-go/util/retry"
"k8s.io/utils/pointer" "k8s.io/utils/pointer"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
"github.com/wencaiwulue/kubevpn/pkg/util" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
func (c *ConnectOptions) addCleanUpResourceHandler() { func (c *ConnectOptions) addCleanUpResourceHandler() {

6
pkg/handler/clone.go
View File

@@ -35,9 +35,9 @@ import (
"k8s.io/kubectl/pkg/util/podutils" "k8s.io/kubectl/pkg/util/podutils"
"k8s.io/utils/pointer" "k8s.io/utils/pointer"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
"github.com/wencaiwulue/kubevpn/pkg/mesh" "github.com/wencaiwulue/kubevpn/v2/pkg/mesh"
"github.com/wencaiwulue/kubevpn/pkg/util" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
type CloneOptions struct { type CloneOptions struct {

12
pkg/handler/connect.go
View File

@@ -61,12 +61,12 @@ import (
"k8s.io/utils/pointer" "k8s.io/utils/pointer"
pkgclient "sigs.k8s.io/controller-runtime/pkg/client" pkgclient "sigs.k8s.io/controller-runtime/pkg/client"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
"github.com/wencaiwulue/kubevpn/pkg/core" "github.com/wencaiwulue/kubevpn/v2/pkg/core"
"github.com/wencaiwulue/kubevpn/pkg/dns" "github.com/wencaiwulue/kubevpn/v2/pkg/dns"
"github.com/wencaiwulue/kubevpn/pkg/driver" "github.com/wencaiwulue/kubevpn/v2/pkg/driver"
"github.com/wencaiwulue/kubevpn/pkg/tun" "github.com/wencaiwulue/kubevpn/v2/pkg/tun"
"github.com/wencaiwulue/kubevpn/pkg/util" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
type ConnectOptions struct { type ConnectOptions struct {

2
pkg/handler/dhcp.go
View File

@@ -15,7 +15,7 @@ import (
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
corev1 "k8s.io/client-go/kubernetes/typed/core/v1" 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 { type DHCPManager struct {

8
pkg/handler/envoy.go
View File

@@ -23,10 +23,10 @@ import (
cmdutil "k8s.io/kubectl/pkg/cmd/util" cmdutil "k8s.io/kubectl/pkg/cmd/util"
"sigs.k8s.io/yaml" "sigs.k8s.io/yaml"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
"github.com/wencaiwulue/kubevpn/pkg/controlplane" "github.com/wencaiwulue/kubevpn/v2/pkg/controlplane"
"github.com/wencaiwulue/kubevpn/pkg/mesh" "github.com/wencaiwulue/kubevpn/v2/pkg/mesh"
"github.com/wencaiwulue/kubevpn/pkg/util" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
// https://istio.io/latest/docs/ops/deployment/requirements/#ports-used-by-istio // https://istio.io/latest/docs/ops/deployment/requirements/#ports-used-by-istio

2
pkg/handler/function_test.go
View File

@@ -28,7 +28,7 @@ import (
cmdutil "k8s.io/kubectl/pkg/cmd/util" cmdutil "k8s.io/kubectl/pkg/cmd/util"
"sigs.k8s.io/yaml" "sigs.k8s.io/yaml"
"github.com/wencaiwulue/kubevpn/pkg/util" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
var ( var (

6
pkg/handler/remote.go
View File

@@ -34,9 +34,9 @@ import (
"k8s.io/kubectl/pkg/util/podutils" "k8s.io/kubectl/pkg/util/podutils"
"k8s.io/utils/pointer" "k8s.io/utils/pointer"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
"github.com/wencaiwulue/kubevpn/pkg/exchange" "github.com/wencaiwulue/kubevpn/v2/pkg/exchange"
"github.com/wencaiwulue/kubevpn/pkg/util" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
func createOutboundPod(ctx context.Context, factory cmdutil.Factory, clientset *kubernetes.Clientset, namespace string) (err error) { func createOutboundPod(ctx context.Context, factory cmdutil.Factory, clientset *kubernetes.Clientset, namespace string) (err error) {

6
pkg/handler/reset.go
View File

@@ -12,9 +12,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/yaml" "sigs.k8s.io/yaml"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
"github.com/wencaiwulue/kubevpn/pkg/controlplane" "github.com/wencaiwulue/kubevpn/v2/pkg/controlplane"
"github.com/wencaiwulue/kubevpn/pkg/dns" "github.com/wencaiwulue/kubevpn/v2/pkg/dns"
) )
// Reset // Reset

6
pkg/handler/serve.go
View File

@@ -8,9 +8,9 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
"github.com/wencaiwulue/kubevpn/pkg/core" "github.com/wencaiwulue/kubevpn/v2/pkg/core"
"github.com/wencaiwulue/kubevpn/pkg/util" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
func RentIPIfNeeded(route *core.Route) error { func RentIPIfNeeded(route *core.Route) error {

4
pkg/mesh/controller.go
View File

@@ -10,8 +10,8 @@ import (
"k8s.io/apimachinery/pkg/util/yaml" "k8s.io/apimachinery/pkg/util/yaml"
"k8s.io/utils/pointer" "k8s.io/utils/pointer"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
"github.com/wencaiwulue/kubevpn/pkg/util" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
//go:embed envoy.yaml //go:embed envoy.yaml

2
pkg/test/local.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/containernetworking/cni/pkg/types" "github.com/containernetworking/cni/pkg/types"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/wencaiwulue/kubevpn/pkg/tun" "github.com/wencaiwulue/kubevpn/v2/pkg/tun"
) )
func main() { func main() {

2
pkg/test/server/server.go
View File

@@ -6,7 +6,7 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/wencaiwulue/kubevpn/pkg/tun" "github.com/wencaiwulue/kubevpn/v2/pkg/tun"
) )
func main() { func main() {

2
pkg/tun/tun.go
View File

@@ -10,7 +10,7 @@ import (
"golang.zx2c4.com/wireguard/device" "golang.zx2c4.com/wireguard/device"
"golang.zx2c4.com/wireguard/tun" "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. // Config is the config for TUN device.

2
pkg/tun/tun_bsd.go
View File

@@ -12,7 +12,7 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"golang.zx2c4.com/wireguard/tun" "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) { func createTun(cfg Config) (conn net.Conn, itf *net.Interface, err error) {

2
pkg/tun/tun_darwin.go
View File

@@ -12,7 +12,7 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"golang.zx2c4.com/wireguard/tun" "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) { func createTun(cfg Config) (conn net.Conn, itf *net.Interface, err error) {

2
pkg/tun/tun_linux.go
View File

@@ -13,7 +13,7 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"golang.zx2c4.com/wireguard/tun" "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) { func createTun(cfg Config) (conn net.Conn, itf *net.Interface, err error) {

4
pkg/upgrade/upgrade.go
View File

@@ -9,8 +9,8 @@ import (
goversion "github.com/hashicorp/go-version" goversion "github.com/hashicorp/go-version"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
"github.com/wencaiwulue/kubevpn/pkg/util" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
// Main // Main

2
pkg/util/cidr.go
View File

@@ -12,7 +12,7 @@ import (
"k8s.io/client-go/rest" "k8s.io/client-go/rest"
"k8s.io/utils/pointer" "k8s.io/utils/pointer"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
) )
// GetCIDRElegant // GetCIDRElegant

2
pkg/util/elevatecheck_others.go
View File

@@ -15,7 +15,7 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/clientcmd"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
) )
const envStartSudoKubeVPNByKubeVPN = config.EnvStartSudoKubeVPNByKubeVPN const envStartSudoKubeVPNByKubeVPN = config.EnvStartSudoKubeVPNByKubeVPN

7
pkg/util/getcidr.go
View File

@@ -20,8 +20,9 @@ import (
corev1 "k8s.io/client-go/kubernetes/typed/core/v1" corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
"k8s.io/client-go/rest" "k8s.io/client-go/rest"
"k8s.io/utils/pointer" "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 // 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{ VolumeSource: v12.VolumeSource{
HostPath: &v12.HostPathVolumeSource{ HostPath: &v12.HostPathVolumeSource{
Path: config.DefaultNetDir, 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{ VolumeSource: v12.VolumeSource{
HostPath: &v12.HostPathVolumeSource{ HostPath: &v12.HostPathVolumeSource{
Path: config.Proc, Path: config.Proc,
Type: (*v12.HostPathType)(pointer.String(string(v12.HostPathDirectoryOrCreate))), Type: ptr.To[v12.HostPathType](v12.HostPathDirectoryOrCreate),
}, },
}, },
}, },

2
pkg/util/net.go
View File

@@ -10,7 +10,7 @@ import (
"github.com/cilium/ipam/service/ipallocator" "github.com/cilium/ipam/service/ipallocator"
"github.com/prometheus-community/pro-bing" "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) { func GetTunDevice(ips ...net.IP) (*net.Interface, error) {

2
pkg/util/networkpolicy_windows.go
View File

@@ -11,7 +11,7 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"golang.org/x/text/encoding/simplifiedchinese" "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 // DeleteBlockFirewallRule Delete all action block firewall rule

2
pkg/util/ns.go
View File

@@ -13,7 +13,7 @@ import (
"k8s.io/client-go/tools/clientcmd/api/latest" "k8s.io/client-go/tools/clientcmd/api/latest"
cmdutil "k8s.io/kubectl/pkg/cmd/util" 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) { func GetClusterId(client v12.ConfigMapInterface) (types.UID, error) {

2
pkg/util/pod.go
View File

@@ -36,7 +36,7 @@ import (
"k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/cmd/util"
"k8s.io/kubectl/pkg/util/podutils" "k8s.io/kubectl/pkg/util/podutils"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
) )
type PodRouteConfig struct { type PodRouteConfig struct {

2
pkg/util/ssh.go
View File

@@ -20,7 +20,7 @@ import (
"golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh"
"k8s.io/client-go/util/homedir" "k8s.io/client-go/util/homedir"
"github.com/wencaiwulue/kubevpn/pkg/daemon/rpc" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc"
) )
type SshConfig struct { type SshConfig struct {

7
pkg/util/upgarde.go
View File

@@ -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) { func GetManifest(httpCli *http.Client, os string, arch string) (version string, commit string, url string, err error) {
var resp *http.Response var resp *http.Response
var errs []error var errs []error
@@ -72,8 +76,7 @@ func GetManifest(httpCli *http.Client, os string, arch string) (version string,
} }
if !found { 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", addr)
err = fmt.Errorf("Can not found latest version url of KubeVPN, you can download it manually: \n%s\n", u)
return return
} }
} }

4
pkg/util/util.go
View File

@@ -35,8 +35,8 @@ import (
cmdutil "k8s.io/kubectl/pkg/cmd/util" cmdutil "k8s.io/kubectl/pkg/cmd/util"
"k8s.io/kubectl/pkg/polymorphichelpers" "k8s.io/kubectl/pkg/polymorphichelpers"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
"github.com/wencaiwulue/kubevpn/pkg/driver" "github.com/wencaiwulue/kubevpn/v2/pkg/driver"
) )
func GetAvailableUDPPortOrDie() (int, error) { func GetAvailableUDPPortOrDie() (int, error) {

4
pkg/webhook/dhcp.go
View File

@@ -10,8 +10,8 @@ import (
"k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes"
"k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/cmd/util"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
"github.com/wencaiwulue/kubevpn/pkg/handler" "github.com/wencaiwulue/kubevpn/v2/pkg/handler"
) )
type dhcpServer struct { type dhcpServer struct {

2
pkg/webhook/mutateadmissionwebhook.go
View File

@@ -15,7 +15,7 @@ import (
"k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes"
cmdutil "k8s.io/kubectl/pkg/cmd/util" 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 // admissionReviewHandler is a handler to handle business logic, holding an util.Factory

4
pkg/webhook/pods.go
View File

@@ -15,8 +15,8 @@ import (
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
"k8s.io/kubectl/pkg/cmd/util/podcmd" "k8s.io/kubectl/pkg/cmd/util/podcmd"
"github.com/wencaiwulue/kubevpn/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/config"
"github.com/wencaiwulue/kubevpn/pkg/handler" "github.com/wencaiwulue/kubevpn/v2/pkg/handler"
) )
// only allow pods to pull images from specific registry. // only allow pods to pull images from specific registry.