apps/kubevpn
1
0
Fork 0
mirror of https://github.com/kubenetworks/kubevpn.git synced 2025-10-21 14:29:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: optimize code (#510)

Browse Source 
* refactor: rename
This commit is contained in:
naison
2025-04-03 20:51:55 +08:00
committed by GitHub
parent dbc9df070b
commit a1bb338cdb
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
charts/kubevpn/templates/deployment.yaml
View File

@@ -47,9 +47,9 @@ spec:
ip6tables -P FORWARD ACCEPT ip6tables -P FORWARD ACCEPT
iptables -t nat -A POSTROUTING -s ${CIDR4} -o eth0 -j MASQUERADE iptables -t nat -A POSTROUTING -s ${CIDR4} -o eth0 -j MASQUERADE
ip6tables -t nat -A POSTROUTING -s ${CIDR6} -o eth0 -j MASQUERADE ip6tables -t nat -A POSTROUTING -s ${CIDR6} -o eth0 -j MASQUERADE
kubevpn serve -L "tcp://:10800" -L "tun://:8422?net=${TunIPv4}" -L "gtcp://:10801" -L "gudp://:10802" --debug=true kubevpn server -L "tcp://:10800" -L "tun://:8422?net=${TunIPv4}" -L "gtcp://:10801" -L "gudp://:10802" --debug=true
{{- else }} {{- else }}
- kubevpn serve -L "tcp://:10800" -L "gtcp://:10801" -L "gudp://:10802" --debug=true - kubevpn server -L "tcp://:10800" -L "gtcp://:10801" -L "gudp://:10802" --debug=true
{{- end }} {{- end }}
command: command:
- /bin/sh - /bin/sh

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

@@ -61,7 +61,7 @@ func NewKubeVPNCommand() *cobra.Command {
CmdDev(factory), CmdDev(factory),
// Hidden, Server Commands (DO NOT USE IT !!!) // Hidden, Server Commands (DO NOT USE IT !!!)
CmdControlPlane(factory), CmdControlPlane(factory),
CmdServe(factory), CmdServer(factory),
CmdDaemon(factory), CmdDaemon(factory),
CmdWebhook(factory), CmdWebhook(factory),
CmdSyncthing(factory), CmdSyncthing(factory),

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

@@ -20,18 +20,18 @@ import (
"github.com/wencaiwulue/kubevpn/v2/pkg/util" "github.com/wencaiwulue/kubevpn/v2/pkg/util"
) )
func CmdServe(_ cmdutil.Factory) *cobra.Command { func CmdServer(_ cmdutil.Factory) *cobra.Command {
var route = &core.Route{} var route = &core.Route{}
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "serve", Use: "server",
Hidden: true, Hidden: true,
Short: "Server side, startup traffic manager, forward inbound and outbound traffic", Short: "Server side, startup traffic manager, forward inbound and outbound traffic",
Long: templates.LongDesc(i18n.T(` Long: templates.LongDesc(i18n.T(`
Server side, startup traffic manager, forward inbound and outbound traffic. Server side, startup traffic manager, forward inbound and outbound traffic.
`)), `)),
Example: templates.Examples(i18n.T(` Example: templates.Examples(i18n.T(`
# serve node # server node
kubevpn serve -L "tcp://:10800" -L "tun://127.0.0.1:8422?net=198.19.0.123/32" kubevpn server -L "tcp://:10800" -L "tun://127.0.0.1:8422?net=198.19.0.123/32"
`)), `)),
PreRun: func(*cobra.Command, []string) { PreRun: func(*cobra.Command, []string) {
runtime.GOMAXPROCS(0) runtime.GOMAXPROCS(0)

4
pkg/handler/remote.go
View File

@@ -365,7 +365,7 @@ func genDeploySpec(namespace string, udp8422 string, tcp10800 string, tcp9002 st
Args: []string{util.If( Args: []string{util.If(
gvisor, gvisor,
` `
kubevpn serve -L "tcp://:10800" -L "gtcp://:10801" -L "gudp://:10802" --debug=true`, kubevpn server -L "tcp://:10800" -L "gtcp://:10801" -L "gudp://:10802" --debug=true`,
` `
sysctl -w net.ipv4.ip_forward=1 sysctl -w net.ipv4.ip_forward=1
sysctl -w net.ipv6.conf.all.disable_ipv6=0 sysctl -w net.ipv6.conf.all.disable_ipv6=0
@@ -379,7 +379,7 @@ iptables -P FORWARD ACCEPT
ip6tables -P FORWARD ACCEPT ip6tables -P FORWARD ACCEPT
iptables -t nat -A POSTROUTING -s ${CIDR4} -o eth0 -j MASQUERADE iptables -t nat -A POSTROUTING -s ${CIDR4} -o eth0 -j MASQUERADE
ip6tables -t nat -A POSTROUTING -s ${CIDR6} -o eth0 -j MASQUERADE ip6tables -t nat -A POSTROUTING -s ${CIDR6} -o eth0 -j MASQUERADE
kubevpn serve -L "tcp://:10800" -L "tun://:8422?net=${TunIPv4}" -L "gtcp://:10801" -L "gudp://:10802" --debug=true`, kubevpn server -L "tcp://:10800" -L "tun://:8422?net=${TunIPv4}" -L "gtcp://:10801" -L "gudp://:10802" --debug=true`,
)}, )},
EnvFrom: []v1.EnvFromSource{{ EnvFrom: []v1.EnvFromSource{{
SecretRef: &v1.SecretEnvSource{ SecretRef: &v1.SecretEnvSource{

4
pkg/inject/controller.go
View File

@@ -61,7 +61,7 @@ iptables -t nat -A PREROUTING ! -p icmp ! -s 127.0.0.1 ! -d ${CIDR4} -j DNAT --t
ip6tables -t nat -A PREROUTING ! -p icmp ! -s 0:0:0:0:0:0:0:1 ! -d ${CIDR6} -j DNAT --to :15006 ip6tables -t nat -A PREROUTING ! -p icmp ! -s 0:0:0:0:0:0:0:1 ! -d ${CIDR6} -j DNAT --to :15006
iptables -t nat -A POSTROUTING ! -p icmp ! -s 127.0.0.1 ! -d ${CIDR4} -j MASQUERADE iptables -t nat -A POSTROUTING ! -p icmp ! -s 127.0.0.1 ! -d ${CIDR4} -j MASQUERADE
ip6tables -t nat -A POSTROUTING ! -p icmp ! -s 0:0:0:0:0:0:0:1 ! -d ${CIDR6} -j MASQUERADE ip6tables -t nat -A POSTROUTING ! -p icmp ! -s 0:0:0:0:0:0:0:1 ! -d ${CIDR6} -j MASQUERADE
kubevpn serve -L "tun:/localhost:8422?net=${TunIPv4}&route=${CIDR4}" -F "tcp://${TrafficManagerService}:10800"`, kubevpn server -L "tun:/localhost:8422?net=${TunIPv4}&route=${CIDR4}" -F "tcp://${TrafficManagerService}:10800"`,
}, },
Env: []v1.EnvVar{ Env: []v1.EnvVar{
{ {
@@ -170,7 +170,7 @@ func AddEnvoyContainer(spec *v1.PodTemplateSpec, ns, nodeId string, ipv6 bool, c
Image: config.Image, Image: config.Image,
Command: []string{"/bin/sh", "-c"}, Command: []string{"/bin/sh", "-c"},
Args: []string{` Args: []string{`
kubevpn serve -L "ssh://:2222"`, kubevpn server -L "ssh://:2222"`,
}, },
Resources: v1.ResourceRequirements{ Resources: v1.ResourceRequirements{
Requests: map[v1.ResourceName]resource.Quantity{ Requests: map[v1.ResourceName]resource.Quantity{

2
pkg/inject/exchange.go
View File

@@ -94,7 +94,7 @@ iptables -t nat -A PREROUTING ! -p icmp -j DNAT --to ${LocalTunIPv4}
ip6tables -t nat -A PREROUTING ! -p icmp -j DNAT --to ${LocalTunIPv6} ip6tables -t nat -A PREROUTING ! -p icmp -j DNAT --to ${LocalTunIPv6}
iptables -t nat -A POSTROUTING ! -p icmp -j MASQUERADE iptables -t nat -A POSTROUTING ! -p icmp -j MASQUERADE
ip6tables -t nat -A POSTROUTING ! -p icmp -j MASQUERADE ip6tables -t nat -A POSTROUTING ! -p icmp -j MASQUERADE
kubevpn serve -L "tun:/127.0.0.1:8422?net=${TunIPv4}&route=${CIDR4}" -F "tcp://${TrafficManagerService}:10800"`, kubevpn server -L "tun:/127.0.0.1:8422?net=${TunIPv4}&route=${CIDR4}" -F "tcp://${TrafficManagerService}:10800"`,
}, },
SecurityContext: &corev1.SecurityContext{ SecurityContext: &corev1.SecurityContext{
Capabilities: &corev1.Capabilities{ Capabilities: &corev1.Capabilities{