diff --git a/src/runtime/cli/kata-env_test.go b/src/runtime/cli/kata-env_test.go index 97260f58bb..ec5b297cef 100644 --- a/src/runtime/cli/kata-env_test.go +++ b/src/runtime/cli/kata-env_test.go @@ -161,7 +161,7 @@ func makeRuntimeConfig(prefixDir string) (configFile string, config oci.RuntimeC return "", oci.RuntimeConfig{}, err } - _, config, err = katautils.LoadConfiguration(configFile, true, false) + _, config, err = katautils.LoadConfiguration(configFile, true) if err != nil { return "", oci.RuntimeConfig{}, err } diff --git a/src/runtime/cli/main.go b/src/runtime/cli/main.go index 0c454f6608..0fecca787d 100644 --- a/src/runtime/cli/main.go +++ b/src/runtime/cli/main.go @@ -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 { fatal(err) } diff --git a/src/runtime/containerd-shim-v2/create.go b/src/runtime/containerd-shim-v2/create.go index 1beaa900bb..fa1311871a 100644 --- a/src/runtime/containerd-shim-v2/create.go +++ b/src/runtime/containerd-shim-v2/create.go @@ -192,7 +192,7 @@ func loadRuntimeConfig(s *service, r *taskAPI.CreateTaskRequest, anno map[string configPath = os.Getenv("KATA_CONF_FILE") } - _, runtimeConfig, err := katautils.LoadConfiguration(configPath, false, true) + _, runtimeConfig, err := katautils.LoadConfiguration(configPath, false) if err != nil { return nil, err } diff --git a/src/runtime/pkg/katautils/config.go b/src/runtime/pkg/katautils/config.go index fc64f9db00..e3f3b3bc9c 100644 --- a/src/runtime/pkg/katautils/config.go +++ b/src/runtime/pkg/katautils/config.go @@ -910,7 +910,7 @@ func updateRuntimeConfigHypervisor(configPath string, tomlConf tomlConfig, confi 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 { config.AgentConfig = vc.KataAgentConfig{ LongLiveConn: true, @@ -985,12 +985,12 @@ func SetKernelParams(runtimeConfig *oci.RuntimeConfig) error { 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 { return err } - if err := updateRuntimeConfigAgent(configPath, tomlConf, config, builtIn); err != nil { + if err := updateRuntimeConfigAgent(configPath, tomlConf, config); err != nil { return err } @@ -1081,7 +1081,7 @@ func initConfig() (config oci.RuntimeConfig, err error) { // // All paths are resolved fully meaning if this function does not return an // 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() if err != nil { @@ -1123,7 +1123,7 @@ func LoadConfiguration(configPath string, ignoreLogging, builtIn bool) (resolved }).Info("loaded configuration") } - if err := updateRuntimeConfig(resolved, tomlConf, &config, builtIn); err != nil { + if err := updateRuntimeConfig(resolved, tomlConf, &config); err != nil { return "", config, err } diff --git a/src/runtime/pkg/katautils/config_test.go b/src/runtime/pkg/katautils/config_test.go index 32be51ff68..0d02534f9a 100644 --- a/src/runtime/pkg/katautils/config_test.go +++ b/src/runtime/pkg/katautils/config_test.go @@ -260,7 +260,7 @@ func testLoadConfiguration(t *testing.T, dir string, assert.NoError(t, err) } - resolvedConfigPath, config, err := LoadConfiguration(file, ignoreLogging, false) + resolvedConfigPath, config, err := LoadConfiguration(file, ignoreLogging) if expectFail { assert.Error(t, err) @@ -566,7 +566,7 @@ func TestMinimalRuntimeConfig(t *testing.T) { t.Error(err) } - _, config, err := LoadConfiguration(configPath, false, false) + _, config, err := LoadConfiguration(configPath, false) if err != nil { 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.Equal(expectedVMConfig, config.HypervisorConfig.MemorySize) @@ -1416,7 +1416,7 @@ func TestUpdateRuntimeConfigurationFactoryConfig(t *testing.T) { tomlConf := tomlConfig{Factory: factory{Template: true}} - err := updateRuntimeConfig("", tomlConf, &config, false) + err := updateRuntimeConfig("", tomlConf, &config) assert.NoError(err) 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") }