containerd-shim-kata-v2: retune the code style

Removed some unused variables and retuned some
if/else code style, at the same time, do not
export those functions and variables which will
not used out this module.

Fixes: #572

Signed-off-by: fupan <[email protected]>

cli/containerd-shim-kata-v2/main.go

@@ -6,11 +6,11 @@
 package main
 
 import (
-"fmt"
-"os"
+	"fmt"
+	"os"
 
-"github.com/kata-containers/runtime/containerd-shim/kata"
-"github.com/containerd/containerd/runtime/v2/shim"
+	"github.com/containerd/containerd/runtime/v2/shim"
+	"github.com/kata-containers/runtime/containerd-shim/kata"
 )
 
 func main() {
@@ -19,4 +19,3 @@ func main() {
 		os.Exit(1)
 	}
 }
-

containerd-shim/kata/config.go

@@ -19,23 +19,20 @@ import (
 )
 
 var defaultHypervisorPath = "/usr/bin/qemu-lite-system-x86_64"
-var defaultImagePath = "/usr/share/kata-containers/kata-containers.img"
 var defaultKernelPath = "/usr/share/kata-containers/vmlinuz.container"
 var defaultInitrdPath = "/usr/share/kata-containers/kata-containers-initrd.img"
 var defaultFirmwarePath = ""
 var defaultMachineAccelerators = ""
 
 const defaultKernelParams = ""
 const defaultMachineType = "pc"
-const defaultRootDirectory = "/var/run/kata-containers"
 const systemdUnitName = "kata-containers.target"
 
 const defaultVCPUCount uint32 = 1
 const defaultMaxVCPUCount uint32 = 0
 const defaultMemSize uint32 = 2048 // MiB
 const defaultBridgesCount uint32 = 1
 const defaultInterNetworkingModel = "macvtap"
-const defaultDisableBlockDeviceUse bool = false
 const defaultBlockDeviceDriver = "virtio-scsi"
 const defaultEnableIOThreads bool = false
 const defaultEnableMemPrealloc bool = false

containerd-shim/kata/container.go

@@ -9,36 +9,35 @@ import (
 	"github.com/containerd/containerd/api/types/task"
 	"github.com/containerd/containerd/errdefs"
 	taskAPI "github.com/containerd/containerd/runtime/v2/task"
-	vc "github.com/kata-containers/runtime/virtcontainers"
 	"sync"
 	"time"
 )
 
-type Container struct {
+type container struct {
 	s        *service
-	pid      uint32
-	id       string
-	stdin    string
-	stdout   string
-	stderr   string
-	ttyio    *TtyIO
-	terminal bool
-
+	ttyio    *ttyIO
+	execs    map[string]*exec
 	exitIOch chan struct{}
 	exitch   chan uint32
+	pid      uint32
+	exit     uint32
+	status   task.Status
+
+	id     string
+	stdin  string
+	stdout string
+	stderr string
+	bundle string
+
+	terminal bool
 
-	bundle    string
-	execs     map[string]*Exec
-	container vc.VCContainer
-	status    task.Status
-	exit      uint32
-	time      time.Time
+	time time.Time
 
 	mu sync.Mutex
 }
 
-func newContainer(s *service, r *taskAPI.CreateTaskRequest, pid uint32, container vc.VCContainer) *Container {
-	c := &Container{
+func newContainer(s *service, r *taskAPI.CreateTaskRequest, pid uint32) *container {
+	c := &container{
 		s:        s,
 		pid:      pid,
 		id:       r.ID,
@@ -47,7 +46,7 @@ func newContainer(s *service, r *taskAPI.CreateTaskRequest, pid uint32, containe
 		stdout:   r.Stdout,
 		stderr:   r.Stderr,
 		terminal: r.Terminal,
-		execs:    make(map[string]*Exec),
+		execs:    make(map[string]*exec),
 		status:   task.StatusCreated,
 		exitIOch: make(chan struct{}),
 		exitch:   make(chan uint32, 1),
@@ -56,7 +55,7 @@ func newContainer(s *service, r *taskAPI.CreateTaskRequest, pid uint32, containe
 	return c
 }
 
-func (c *Container) getExec(id string) (*Exec, error) {
+func (c *container) getExec(id string) (*exec, error) {
 	exec := c.execs[id]
 
 	if exec == nil {

containerd-shim/kata/create.go

@@ -70,29 +70,7 @@ func create(s *service, containerID, bundlePath, netns string, detach bool,
 		}
 	}
 
-	if runtimeConfig.FactoryConfig.Template {
-		factoryConfig := vf.Config{
-			Template: true,
-			VMConfig: vc.VMConfig{
-				HypervisorType:   runtimeConfig.HypervisorType,
-				HypervisorConfig: runtimeConfig.HypervisorConfig,
-				AgentType:        runtimeConfig.AgentType,
-				AgentConfig:      runtimeConfig.AgentConfig,
-			},
-		}
-		logrus.WithField("factory", factoryConfig).Info("load vm factory")
-		f, err := vf.NewFactory(factoryConfig, true)
-		if err != nil {
-			logrus.WithError(err).Warn("load vm factory failed, about to create new one")
-			f, err = vf.NewFactory(factoryConfig, false)
-			if err != nil {
-				logrus.WithError(err).Warn("create vm factory failed")
-			}
-		}
-		if err != nil {
-			vci.SetFactory(f)
-		}
-	}
+	setFactory(runtimeConfig)
 
 	disableOutput := noNeedForOutput(detach, ociSpec.Process.Terminal)
 
@@ -123,6 +101,32 @@ func create(s *service, containerID, bundlePath, netns string, detach bool,
 	return c, nil
 }
 
+func setFactory(runtimeConfig *oci.RuntimeConfig) {
+	if runtimeConfig.FactoryConfig.Template {
+		factoryConfig := vf.Config{
+			Template: true,
+			VMConfig: vc.VMConfig{
+				HypervisorType:   runtimeConfig.HypervisorType,
+				HypervisorConfig: runtimeConfig.HypervisorConfig,
+				AgentType:        runtimeConfig.AgentType,
+				AgentConfig:      runtimeConfig.AgentConfig,
+			},
+		}
+		logrus.WithField("factory", factoryConfig).Info("load vm factory")
+		f, err := vf.NewFactory(factoryConfig, true)
+		if err != nil {
+			logrus.WithError(err).Warn("load vm factory failed, about to create new one")
+			f, err = vf.NewFactory(factoryConfig, false)
+			if err != nil {
+				logrus.WithError(err).Warn("create vm factory failed")
+			}
+		}
+		if err != nil {
+			vci.SetFactory(f)
+		}
+	}
+}
+
 var systemdKernelParam = []vc.Param{
 	{
 		Key:   "init",

containerd-shim/kata/delete.go

@@ -12,7 +12,7 @@ import (
 	"path"
 )
 
-func deleteContainer(s *service, c *Container) error {
+func deleteContainer(s *service, c *container) error {
 
 	status, err := s.sandbox.StatusContainer(c.id)
 	if err != nil {

containerd-shim/kata/exec.go

@@ -16,23 +16,25 @@ import (
 	"time"
 )
 
-type Exec struct {
+type exec struct {
+	container *container
+	cmds      *vc.Cmd
+	tty       *tty
+	ttyio     *ttyIO
 	id        string
 	pid       uint32
-	container *Container
-	cmds      *vc.Cmd
-	exitCode  int32
-	tty       *Tty
-	ttyio     *TtyIO
-	status    task.Status
+
+	exitCode int32
+
+	status task.Status
 
 	exitIOch chan struct{}
 	exitch   chan uint32
 
 	exitTime time.Time
 }
 
-type Tty struct {
+type tty struct {
 	stdin    string
 	stdout   string
 	stderr   string
@@ -60,7 +62,7 @@ func getEnvs(envs []string) []vc.EnvVar {
 	return vcEnvs
 }
 
-func newExec(c *Container, stdin, stdout, stderr string, terminal bool, jspec *googleProtobuf.Any) (*Exec, error) {
+func newExec(c *container, stdin, stdout, stderr string, terminal bool, jspec *googleProtobuf.Any) (*exec, error) {
 	var height uint32
 	var width uint32
 
@@ -75,7 +77,7 @@ func newExec(c *Container, stdin, stdout, stderr string, terminal bool, jspec *g
 		width = uint32(spec.ConsoleSize.Width)
 	}
 
-	tty := &Tty{
+	tty := &tty{
 		stdin:    stdin,
 		stdout:   stdout,
 		stderr:   stderr,
@@ -95,7 +97,7 @@ func newExec(c *Container, stdin, stdout, stderr string, terminal bool, jspec *g
 		NoNewPrivileges: spec.NoNewPrivileges,
 	}
 
-	exec := &Exec{
+	exec := &exec{
 		container: c,
 		cmds:      cmds,
 		tty:       tty,

containerd-shim/kata/metrics.go

@@ -2,6 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 //
+
 package kata
 
 import (