feat: sync mode modify api server & add ut for mode run and mode sync (#704)

* feat: mode sync modify kubeconfig apiserver to in cluster apiserver
* feat: add ut for sync mode and run mode
* fix: bugs

Author: wencaiwulue

.github/workflows/coverage.yml

@@ -58,7 +58,7 @@ jobs:
 
       - name: Wait for pods reviews to be ready
         run: |
-          kubectl wait --for=condition=Ready pods --all --timeout=3600s
+          while ! kubectl wait --for=condition=Ready pods --all --timeout=3600s; do sleep 2; done
           kubectl get svc -A -o wide
           kubectl get pod -A -o wide
           kubectl get all -o wide

.github/workflows/test.yml

@@ -74,7 +74,7 @@ jobs:
 
       - name: Wait for pods reviews to be ready
         run: |
-          kubectl wait --for=condition=Ready pods --all --timeout=3600s
+          while ! kubectl wait --for=condition=Ready pods --all --timeout=3600s; do sleep 2; done
           kubectl get svc -A -o wide
           kubectl get pod -A -o wide
           kubectl get all -o wide
@@ -146,7 +146,7 @@ jobs:
 
       - name: Wait for pods reviews to be ready
         run: |
-          kubectl wait --for=condition=Ready pods --all --timeout=3600s
+          while ! kubectl wait --for=condition=Ready pods --all --timeout=3600s; do sleep 2; done
           kubectl get svc -A -o wide || true
           kubectl get pod -A -o wide || true
           kubectl get all -o wide || true
@@ -155,6 +155,9 @@ jobs:
           netstat -anr
 
       - name: Test
+        # for docker mount
+        env:
+          TMPDIR: /tmp
         run: make ut
 
   windows:

cmd/kubevpn/cmds/connect.go

@@ -36,12 +36,11 @@ func CmdConnect(f cmdutil.Factory) *cobra.Command {
 		Short: i18n.T("Connect to kubernetes cluster network"),
 		Long: templates.LongDesc(i18n.T(`
 		Connect to kubernetes cluster network
-		
-		After connect to kubernetes cluster network, you can ping PodIP or
-		curl ServiceIP in local PC, it also supports k8s DNS resolve. 
-		Like: curl authors/authors.default/authors.default.svc/authors.default.svc.cluster.local.
-		So you can start up your application in local PC. depends on anything in
-		k8s cluster is ok, connect to them just like in k8s cluster.
+
+		Upon establishing a connection to the Kubernetes cluster network, you can directly access Pod IPs and Service IPs from your local machine. 
+        This includes capabilities such as ping Pod IPs or curl Service IPs. 
+		Full Kubernetes DNS resolution is supported, enabling access via standard naming conventions,
+		This allows you to run applications locally while seamlessly connecting to all resources within the Kubernetes cluster, as if operating inside the cluster itself.
 		`)),
 		Example: templates.Examples(i18n.T(`
 		# Connect to k8s cluster network

cmd/kubevpn/cmds/run.go

@@ -100,11 +100,8 @@ func CmdRun(f cmdutil.Factory) *cobra.Command {
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			options.Workload = args[0]
-			for i, arg := range args {
-				if arg == "--" && i != len(args)-1 {
-					options.ContainerOptions.Args = args[i+1:]
-					break
-				}
+			if len(args) > 1 {
+				options.ContainerOptions.Args = args[1:]
 			}
 
 			if err := options.InitClient(f); err != nil {

go.mod

@@ -3,6 +3,7 @@ module github.com/wencaiwulue/kubevpn/v2
 go 1.23.2
 
 require (
+	github.com/calmh/incontainer v1.0.0
 	github.com/cilium/ipam v0.0.0-20230509084518-fd66eae7909b
 	github.com/containerd/containerd v1.7.27
 	github.com/containernetworking/cni v1.1.2
@@ -24,6 +25,7 @@ require (
 	github.com/hpcloud/tail v1.0.0
 	github.com/jcmturner/gofork v1.7.6
 	github.com/jcmturner/gokrb5/v8 v8.4.4
+	github.com/joho/godotenv v1.5.1
 	github.com/kevinburke/ssh_config v1.2.0
 	github.com/libp2p/go-netroute v0.2.1
 	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de
@@ -88,7 +90,6 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bits-and-blooms/bitset v1.13.0 // indirect
 	github.com/blang/semver/v4 v4.0.0 // indirect
-	github.com/calmh/incontainer v1.0.0 // indirect
 	github.com/calmh/xdr v1.2.0 // indirect
 	github.com/ccding/go-stun v0.1.5 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect

go.sum

@@ -361,6 +361,8 @@ github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/
 github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
 github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
+github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
+github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/josharian/native v1.1.1-0.20230202152459-5c7d0dd6ab86 h1:elKwZS1OcdQ0WwEDBeqxKwb7WB62QX8bvZ/FJnVXIfk=

pkg/daemon/action/sync.go

@@ -117,7 +117,11 @@ func (svr *Server) Sync(resp rpc.Daemon_SyncServer) (err error) {
 	}
 	logger.Infof("Sync workloads...")
 	options.SetContext(sshCtx)
-	err = options.DoSync(plog.WithLogger(sshCtx, logger), []byte(req.KubeconfigBytes), req.Image)
+	newKubeconfigBytes, err := options.ConvertApiServerToNodeIP(resp.Context(), []byte(req.KubeconfigBytes))
+	if err != nil {
+		return err
+	}
+	err = options.DoSync(plog.WithLogger(sshCtx, logger), newKubeconfigBytes, req.Image)
 	if err != nil {
 		plog.G(context.Background()).Errorf("Sync workloads failed: %v", err)
 		return err