feat: optimize code

pkg/dev/convert.go

@@ -3,6 +3,9 @@ package dev
 import (
 	"context"
 	"fmt"
+	"math/rand"
+	"os"
+	"path/filepath"
 	"strconv"
 	"strings"
 	"unsafe"
@@ -14,12 +17,18 @@ import (
 	"github.com/docker/go-connections/nat"
 	"github.com/google/uuid"
 	miekgdns "github.com/miekg/dns"
+	"github.com/moby/term"
 	v12 "github.com/opencontainers/image-spec/specs-go/v1"
+	"github.com/spf13/cobra"
 	"k8s.io/api/core/v1"
 	v13 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/cli-runtime/pkg/genericclioptions"
 	"k8s.io/kubectl/pkg/cmd/util"
 
+	"github.com/wencaiwulue/kubevpn/pkg/config"
+	"github.com/wencaiwulue/kubevpn/pkg/cp"
 	"github.com/wencaiwulue/kubevpn/pkg/dns"
+	"github.com/wencaiwulue/kubevpn/pkg/handler"
 )
 
 type RunConfig struct {
@@ -143,7 +152,7 @@ func ConvertKubeResourceToContainer(namespace string, temp v1.PodTemplateSpec, e
 		r.k8sContainerName = c.Name
 		r.config = config
 		r.hostConfig = hostConfig
-		r.networkingConfig = nil
+		r.networkingConfig = &network.NetworkingConfig{EndpointsConfig: make(map[string]*network.EndpointSettings)}
 		r.platform = /*&v12.Platform{Architecture: "amd64", OS: "linux"}*/ nil
 
 		runConfigList = append(runConfigList, &r)
@@ -176,3 +185,63 @@ func GetDNS(ctx context.Context, f util.Factory, ns, pod string) (*miekgdns.Clie
 	}
 	return fromPod, nil
 }
+
+// GetVolume key format: [container name]-[volume mount name]
+func GetVolume(ctx context.Context, f util.Factory, ns, pod string) (map[string][]mount.Mount, error) {
+	clientSet, err := f.KubernetesClientSet()
+	if err != nil {
+		return nil, err
+	}
+	var get *v1.Pod
+	get, err = clientSet.CoreV1().Pods(ns).Get(ctx, pod, v13.GetOptions{})
+	if err != nil {
+		return nil, err
+	}
+	result := map[string][]mount.Mount{}
+	for _, c := range get.Spec.Containers {
+		// if container name is vpn or envoy-proxy, not need to download volume
+		if c.Name == config.ContainerSidecarVPN || c.Name == config.ContainerSidecarEnvoyProxy {
+			continue
+		}
+		var m []mount.Mount
+		for _, volumeMount := range c.VolumeMounts {
+			if volumeMount.MountPath == "/tmp" {
+				continue
+			}
+			join := filepath.Join(os.TempDir(), strconv.Itoa(rand.Int()))
+			err = os.MkdirAll(join, 0755)
+			if err != nil {
+				return nil, err
+			}
+			if volumeMount.SubPath != "" {
+				join = filepath.Join(join, volumeMount.SubPath)
+			}
+			handler.RollbackFuncList = append(handler.RollbackFuncList, func() {
+				_ = os.RemoveAll(join)
+			})
+			// pod-namespace/pod-name:path
+			remotePath := fmt.Sprintf("%s/%s:%s", ns, pod, volumeMount.MountPath)
+			stdIn, stdOut, stdErr := term.StdStreams()
+			copyOptions := cp.NewCopyOptions(genericclioptions.IOStreams{In: stdIn, Out: stdOut, ErrOut: stdErr})
+			copyOptions.Container = c.Name
+			copyOptions.MaxTries = 10
+			err = copyOptions.Complete(f, &cobra.Command{}, []string{remotePath, join})
+			if err != nil {
+				return nil, err
+			}
+			err = copyOptions.Run()
+			if err != nil {
+				_, _ = fmt.Fprintf(os.Stderr, "failed to download volume %s path %s to %s, err: %v, ignore...\n", volumeMount.Name, remotePath, join, err)
+				continue
+			}
+			m = append(m, mount.Mount{
+				Type:   mount.TypeBind,
+				Source: join,
+				Target: volumeMount.MountPath,
+			})
+			fmt.Printf("%s:%s\n", join, volumeMount.MountPath)
+		}
+		result[c.Name] = m
+	}
+	return result, nil
+}

pkg/dev/main.go

@@ -44,14 +44,14 @@ type Options struct {
 	// docker options
 	Platform string
 	//Pull         string // always, missing, never
-	PublishAll   bool
-	Entrypoint   string
-	DockerImage  string
-	Publish      opts.ListOpts
-	Expose       opts.ListOpts
-	ExtraHosts   opts.ListOpts
-	NetMode      opts.NetworkOpt
-	Aliases      opts.ListOpts
+	PublishAll  bool
+	Entrypoint  string
+	DockerImage string
+	Publish     opts.ListOpts
+	Expose      opts.ListOpts
+	ExtraHosts  opts.ListOpts
+	NetMode     opts.NetworkOpt
+	//Aliases      opts.ListOpts
 	Env          opts.ListOpts
 	Mounts       opts.MountOpt
 	Volumes      opts.ListOpts
@@ -99,7 +99,7 @@ func (d Options) Main(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
-	volume, err := util.GetVolume(ctx, d.Factory, d.Namespace, pod)
+	volume, err := GetVolume(ctx, d.Factory, d.Namespace, pod)
 	if err != nil {
 		return err
 	}
@@ -232,7 +232,7 @@ func (r Run) Run(ctx context.Context, volume map[string][]mount.Mount) error {
 		id, err = run(ctx, config, cli)
 		if err != nil {
 			// try another way to startup container
-			log.Info("try another way to startup container")
+			log.Infof("occur err: %v, try another way to startup container...", err)
 			config.hostConfig.Mounts = nil
 			id, err = run(ctx, config, cli)
 			if err != nil {

pkg/dev/option.go

@@ -148,11 +148,6 @@ func fillOptions(r Run, copts Options) error {
 
 	config.hostConfig.Binds = binds
 
-	// todo
-	if copts.Aliases.Len() != 0 {
-		//config.networkingConfig.EndpointsConfig
-	}
-
 	return nil
 }
 

pkg/dev/run.go

@@ -70,6 +70,11 @@ func run(ctx context.Context, runConfig *RunConfig, cli *client.Client) (id stri
 	}
 	id = create.ID
 	log.Infof("Created container: %s", name)
+	defer func() {
+		if err != nil {
+			_ = cli.ContainerRemove(ctx, id, types.ContainerRemoveOptions{Force: true})
+		}
+	}()
 
 	err = cli.ContainerStart(ctx, create.ID, types.ContainerStartOptions{})
 	if err != nil {