github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-05-03 14:07:24 +00:00
Code Issues Projects Releases Wiki Activity

runtime: remove not used shim configurations

Browse Source 
ShimPath and ShimDebug are not needed anymore.

Fixes: #6147

Signed-off-by: d3c3mber <tangbo_gl_2022@163.com>
This commit is contained in:
d3c3mber 2023-02-07 14:06:12 +08:00
parent a34f36f8f4
commit 390916b33c
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/runtime/pkg/containerd-shim-v2/create_test.go
View File

@ -320,7 +320,6 @@ func createAllRuntimeConfigFiles(dir, hypervisor string) (config string, err err
kernelPath := path.Join(dir, "kernel") kernelPath := path.Join(dir, "kernel")
kernelParams := "foo=bar xyz" kernelParams := "foo=bar xyz"
imagePath := path.Join(dir, "image") imagePath := path.Join(dir, "image")
shimPath := path.Join(dir, "shim")
logDir := path.Join(dir, "logs") logDir := path.Join(dir, "logs")
logPath := path.Join(logDir, "runtime.log") logPath := path.Join(logDir, "runtime.log")
machineType := "machineType" machineType := "machineType"
@ -340,7 +339,6 @@ func createAllRuntimeConfigFiles(dir, hypervisor string) (config string, err err
ImagePath: imagePath, ImagePath: imagePath,
KernelParams: kernelParams, KernelParams: kernelParams,
MachineType: machineType, MachineType: machineType,
ShimPath: shimPath,
LogPath: logPath, LogPath: logPath,
DisableBlock: disableBlockDevice, DisableBlock: disableBlockDevice,
BlockDeviceDriver: blockDeviceDriver, BlockDeviceDriver: blockDeviceDriver,
@ -360,7 +358,7 @@ func createAllRuntimeConfigFiles(dir, hypervisor string) (config string, err err
return "", err return "", err
} }
files := []string{hypervisorPath, kernelPath, imagePath, shimPath} files := []string{hypervisorPath, kernelPath, imagePath}
for _, file := range files { for _, file := range files {
// create the resource (which must be >0 bytes) // create the resource (which must be >0 bytes)

6
src/runtime/pkg/katatestutils/utils.go
View File

@ -213,7 +213,6 @@ type RuntimeConfigOptions struct {
ImagePath string ImagePath string
KernelParams string KernelParams string
MachineType string MachineType string
ShimPath string
LogPath string LogPath string
BlockDeviceDriver string BlockDeviceDriver string
BlockDeviceAIO string BlockDeviceAIO string
@ -236,7 +235,6 @@ type RuntimeConfigOptions struct {
HypervisorDebug bool HypervisorDebug bool
RuntimeDebug bool RuntimeDebug bool
RuntimeTrace bool RuntimeTrace bool
ShimDebug bool
AgentDebug bool AgentDebug bool
AgentTrace bool AgentTrace bool
EnablePprof bool EnablePprof bool
@ -323,10 +321,6 @@ func MakeRuntimeConfigFileData(config RuntimeConfigOptions) string {
shared_fs = "` + config.SharedFS + `" shared_fs = "` + config.SharedFS + `"
virtio_fs_daemon = "` + config.VirtioFSDaemon + `" virtio_fs_daemon = "` + config.VirtioFSDaemon + `"
[shim.kata]
path = "` + config.ShimPath + `"
enable_debug = ` + strconv.FormatBool(config.ShimDebug) + `
[agent.kata] [agent.kata]
enable_debug = ` + strconv.FormatBool(config.AgentDebug) + ` enable_debug = ` + strconv.FormatBool(config.AgentDebug) + `
enable_tracing = ` + strconv.FormatBool(config.AgentTrace) + ` enable_tracing = ` + strconv.FormatBool(config.AgentTrace) + `