github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-25 15:02:45 +00:00
Code Issues Projects Releases Wiki Activity

runtime: delete not used function parameter builtIn

Browse Source 
Parametr builtIn is not used in function updateRuntimeConfigAgent,
delete it from updateRuntimeConfigAgent and LoadConfiguration
function signature.

Fixes: #1731

Signed-off-by: bin <bin@hyper.sh>
This commit is contained in:
bin 2021-04-23 15:35:26 +08:00
parent db4fbac1d3
commit 677f0d9904
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/runtime/cli/kata-env_test.go
View File

@ -161,7 +161,7 @@ func makeRuntimeConfig(prefixDir string) (configFile string, config oci.RuntimeC
return "", oci.RuntimeConfig{}, err return "", oci.RuntimeConfig{}, err
} }
_, config, err = katautils.LoadConfiguration(configFile, true, false) _, config, err = katautils.LoadConfiguration(configFile, true)
if err != nil { if err != nil {
return "", oci.RuntimeConfig{}, err return "", oci.RuntimeConfig{}, err
} }

2
src/runtime/cli/main.go
View File

@ -319,7 +319,7 @@ func beforeSubcommands(c *cli.Context) error {
} }
} }
configFile, runtimeConfig, err = katautils.LoadConfiguration(c.GlobalString("kata-config"), ignoreConfigLogs, false) configFile, runtimeConfig, err = katautils.LoadConfiguration(c.GlobalString("kata-config"), ignoreConfigLogs)
if err != nil { if err != nil {
fatal(err) fatal(err)
} }

2
src/runtime/containerd-shim-v2/create.go
View File

@ -192,7 +192,7 @@ func loadRuntimeConfig(s *service, r *taskAPI.CreateTaskRequest, anno map[string
configPath = os.Getenv("KATA_CONF_FILE") configPath = os.Getenv("KATA_CONF_FILE")
} }
_, runtimeConfig, err := katautils.LoadConfiguration(configPath, false, true) _, runtimeConfig, err := katautils.LoadConfiguration(configPath, false)
if err != nil { if err != nil {
return nil, err return nil, err
} }

10
src/runtime/pkg/katautils/config.go
View File

@ -905,7 +905,7 @@ func updateRuntimeConfigHypervisor(configPath string, tomlConf tomlConfig, confi
return nil return nil
} }
func updateRuntimeConfigAgent(configPath string, tomlConf tomlConfig, config *oci.RuntimeConfig, builtIn bool) error { func updateRuntimeConfigAgent(configPath string, tomlConf tomlConfig, config *oci.RuntimeConfig) error {
for _, agent := range tomlConf.Agent { for _, agent := range tomlConf.Agent {
config.AgentConfig = vc.KataAgentConfig{ config.AgentConfig = vc.KataAgentConfig{
LongLiveConn: true, LongLiveConn: true,
@ -980,12 +980,12 @@ func SetKernelParams(runtimeConfig *oci.RuntimeConfig) error {
return nil return nil
} }
func updateRuntimeConfig(configPath string, tomlConf tomlConfig, config *oci.RuntimeConfig, builtIn bool) error { func updateRuntimeConfig(configPath string, tomlConf tomlConfig, config *oci.RuntimeConfig) error {
if err := updateRuntimeConfigHypervisor(configPath, tomlConf, config); err != nil { if err := updateRuntimeConfigHypervisor(configPath, tomlConf, config); err != nil {
return err return err
} }
if err := updateRuntimeConfigAgent(configPath, tomlConf, config, builtIn); err != nil { if err := updateRuntimeConfigAgent(configPath, tomlConf, config); err != nil {
return err return err
} }
@ -1076,7 +1076,7 @@ func initConfig() (config oci.RuntimeConfig, err error) {
// //
// All paths are resolved fully meaning if this function does not return an // All paths are resolved fully meaning if this function does not return an
// error, all paths are valid at the time of the call. // error, all paths are valid at the time of the call.
func LoadConfiguration(configPath string, ignoreLogging, builtIn bool) (resolvedConfigPath string, config oci.RuntimeConfig, err error) { func LoadConfiguration(configPath string, ignoreLogging bool) (resolvedConfigPath string, config oci.RuntimeConfig, err error) {
config, err = initConfig() config, err = initConfig()
if err != nil { if err != nil {
@ -1118,7 +1118,7 @@ func LoadConfiguration(configPath string, ignoreLogging, builtIn bool) (resolved
}).Info("loaded configuration") }).Info("loaded configuration")
} }
if err := updateRuntimeConfig(resolved, tomlConf, &config, builtIn); err != nil { if err := updateRuntimeConfig(resolved, tomlConf, &config); err != nil {
return "", config, err return "", config, err
} }

10
src/runtime/pkg/katautils/config_test.go
View File

@ -260,7 +260,7 @@ func testLoadConfiguration(t *testing.T, dir string,
assert.NoError(t, err) assert.NoError(t, err)
} }
resolvedConfigPath, config, err := LoadConfiguration(file, ignoreLogging, false) resolvedConfigPath, config, err := LoadConfiguration(file, ignoreLogging)
if expectFail { if expectFail {
assert.Error(t, err) assert.Error(t, err)
@ -566,7 +566,7 @@ func TestMinimalRuntimeConfig(t *testing.T) {
t.Error(err) t.Error(err)
} }
_, config, err := LoadConfiguration(configPath, false, false) _, config, err := LoadConfiguration(configPath, false)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -1398,7 +1398,7 @@ func TestUpdateRuntimeConfigurationVMConfig(t *testing.T) {
}, },
} }
err := updateRuntimeConfig("", tomlConf, &config, false) err := updateRuntimeConfig("", tomlConf, &config)
assert.NoError(err) assert.NoError(err)
assert.Equal(expectedVMConfig, config.HypervisorConfig.MemorySize) assert.Equal(expectedVMConfig, config.HypervisorConfig.MemorySize)
@ -1416,7 +1416,7 @@ func TestUpdateRuntimeConfigurationFactoryConfig(t *testing.T) {
tomlConf := tomlConfig{Factory: factory{Template: true}} tomlConf := tomlConfig{Factory: factory{Template: true}}
err := updateRuntimeConfig("", tomlConf, &config, false) err := updateRuntimeConfig("", tomlConf, &config)
assert.NoError(err) assert.NoError(err)
assert.Equal(expectedFactoryConfig, config.FactoryConfig) assert.Equal(expectedFactoryConfig, config.FactoryConfig)
@ -1443,7 +1443,7 @@ func TestUpdateRuntimeConfigurationInvalidKernelParams(t *testing.T) {
} }
} }
err := updateRuntimeConfig("", tomlConf, &config, false) err := updateRuntimeConfig("", tomlConf, &config)
assert.EqualError(err, "Empty kernel parameter") assert.EqualError(err, "Empty kernel parameter")
} }