Revert "feat: add ssh foreground"

This reverts commit b80e282.

cmd/kubevpn/cmds/connect.go

@@ -1,9 +1,11 @@
 package cmds
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"os"
+	"time"
 
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
@@ -61,46 +63,49 @@ func CmdConnect(f cmdutil.Factory) *cobra.Command {
 
 				SshJump:       sshConf.ToRPC(),
 				TransferImage: transferImage,
-				Foreground:    foreground,
 				Image:         config.Image,
 				Level:         int32(log.DebugLevel),
 			}
-			// if is foreground, send to sudo daemon server
-			if foreground {
-				cli := daemon.GetClient(true)
-				resp, err := cli.ConnectFork(cmd.Context(), req)
-				if err != nil {
+			cli := daemon.GetClient(false)
+			resp, err := cli.Connect(cmd.Context(), req)
+			if err != nil {
+				return err
+			}
+			for {
+				recv, err := resp.Recv()
+				if err == io.EOF {
+					break
+				} else if code := status.Code(err); code == codes.DeadlineExceeded || code == codes.Canceled {
+					return nil
+				} else if err != nil {
 					return err
 				}
-				for {
-					recv, err := resp.Recv()
-					if err == io.EOF {
-						break
-					} else if code := status.Code(err); code == codes.DeadlineExceeded || code == codes.Canceled {
-						return nil
-					} else if err != nil {
-						return err
-					}
-					fmt.Fprint(os.Stdout, recv.GetMessage())
-				}
-			} else {
-				cli := daemon.GetClient(false)
-				resp, err := cli.Connect(cmd.Context(), req)
+				fmt.Fprint(os.Stdout, recv.GetMessage())
+			}
+			util.Print(os.Stdout, "Now you can access resources in the kubernetes cluster, enjoy it :)")
+			// hangup
+			if foreground {
+				// disconnect from cluster network
+				<-cmd.Context().Done()
+
+				now := time.Now()
+				stream, err := cli.Disconnect(context.Background(), &rpc.DisconnectRequest{})
+				fmt.Printf("call api disconnect use %s\n", time.Now().Sub(now).String())
 				if err != nil {
 					return err
 				}
+				var resp *rpc.DisconnectResponse
 				for {
-					recv, err := resp.Recv()
+					resp, err = stream.Recv()
 					if err == io.EOF {
-						break
+						return nil
 					} else if code := status.Code(err); code == codes.DeadlineExceeded || code == codes.Canceled {
 						return nil
 					} else if err != nil {
 						return err
 					}
-					fmt.Fprint(os.Stdout, recv.GetMessage())
+					fmt.Fprint(os.Stdout, resp.Message)
 				}
-				util.Print(os.Stdout, "Now you can access resources in the kubernetes cluster, enjoy it :)")
 			}
 			return nil
 		},

cmd/kubevpn/cmds/root.go

@@ -50,7 +50,6 @@ func NewKubeVPNCommand() *cobra.Command {
 			Message: "Develop commands:",
 			Commands: []*cobra.Command{
 				CmdConnect(factory),
-				CmdConnectFork(factory),
 				CmdDisconnect(factory),
 				CmdProxy(factory),
 				CmdLeave(factory),