diff --git a/charts/kubevpn/templates/deployment.yaml b/charts/kubevpn/templates/deployment.yaml index e5ec6353..60347560 100644 --- a/charts/kubevpn/templates/deployment.yaml +++ b/charts/kubevpn/templates/deployment.yaml @@ -47,9 +47,9 @@ spec: ip6tables -P FORWARD ACCEPT iptables -t nat -A POSTROUTING -s ${CIDR4} -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 }} - - 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 }} command: - /bin/sh diff --git a/cmd/kubevpn/cmds/root.go b/cmd/kubevpn/cmds/root.go index 13e512e3..f8900d49 100644 --- a/cmd/kubevpn/cmds/root.go +++ b/cmd/kubevpn/cmds/root.go @@ -61,7 +61,7 @@ func NewKubeVPNCommand() *cobra.Command { CmdDev(factory), // Hidden, Server Commands (DO NOT USE IT !!!) CmdControlPlane(factory), - CmdServe(factory), + CmdServer(factory), CmdDaemon(factory), CmdWebhook(factory), CmdSyncthing(factory), diff --git a/cmd/kubevpn/cmds/serve.go b/cmd/kubevpn/cmds/server.go similarity index 90% rename from cmd/kubevpn/cmds/serve.go rename to cmd/kubevpn/cmds/server.go index 593411d9..5c759860 100644 --- a/cmd/kubevpn/cmds/serve.go +++ b/cmd/kubevpn/cmds/server.go @@ -20,18 +20,18 @@ import ( "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) -func CmdServe(_ cmdutil.Factory) *cobra.Command { +func CmdServer(_ cmdutil.Factory) *cobra.Command { var route = &core.Route{} cmd := &cobra.Command{ - Use: "serve", + Use: "server", Hidden: true, Short: "Server side, startup traffic manager, forward inbound and outbound traffic", Long: templates.LongDesc(i18n.T(` Server side, startup traffic manager, forward inbound and outbound traffic. `)), Example: templates.Examples(i18n.T(` - # serve node - kubevpn serve -L "tcp://:10800" -L "tun://127.0.0.1:8422?net=198.19.0.123/32" + # server node + kubevpn server -L "tcp://:10800" -L "tun://127.0.0.1:8422?net=198.19.0.123/32" `)), PreRun: func(*cobra.Command, []string) { runtime.GOMAXPROCS(0) diff --git a/pkg/handler/remote.go b/pkg/handler/remote.go index bbc636a6..475f7643 100644 --- a/pkg/handler/remote.go +++ b/pkg/handler/remote.go @@ -365,7 +365,7 @@ func genDeploySpec(namespace string, udp8422 string, tcp10800 string, tcp9002 st Args: []string{util.If( 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.ipv6.conf.all.disable_ipv6=0 @@ -379,7 +379,7 @@ iptables -P FORWARD ACCEPT ip6tables -P FORWARD ACCEPT iptables -t nat -A POSTROUTING -s ${CIDR4} -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{{ SecretRef: &v1.SecretEnvSource{ diff --git a/pkg/inject/controller.go b/pkg/inject/controller.go index 7185fdf0..0713d183 100644 --- a/pkg/inject/controller.go +++ b/pkg/inject/controller.go @@ -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 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 -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{ { @@ -170,7 +170,7 @@ func AddEnvoyContainer(spec *v1.PodTemplateSpec, ns, nodeId string, ipv6 bool, c Image: config.Image, Command: []string{"/bin/sh", "-c"}, Args: []string{` -kubevpn serve -L "ssh://:2222"`, +kubevpn server -L "ssh://:2222"`, }, Resources: v1.ResourceRequirements{ Requests: map[v1.ResourceName]resource.Quantity{ diff --git a/pkg/inject/exchange.go b/pkg/inject/exchange.go index 0cd08265..b347298c 100644 --- a/pkg/inject/exchange.go +++ b/pkg/inject/exchange.go @@ -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} iptables -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{ Capabilities: &corev1.Capabilities{