UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2025-02-04 03:56:23 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Remove Set from engine config API

Browse Source 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
Evan Lezar 2025-01-27 15:38:55 +01:00
parent df73db7e1e
commit f625242ed6
No known key found for this signature in database
4 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/config/engine/api.go
View File

@ -24,7 +24,6 @@ type Interface interface {
GetRuntimeConfig(string) (RuntimeConfig, error) GetRuntimeConfig(string) (RuntimeConfig, error)
RemoveRuntime(string) error RemoveRuntime(string) error
Save(string) (int64, error) Save(string) (int64, error)
Set(string, interface{})
String() string String() string
} }

11
pkg/config/engine/containerd/config.go
View File

@ -96,13 +96,6 @@ func (c *Config) getRuntimeAnnotations(path []string) ([]string, error) {
return annotations, nil return annotations, nil
} }
// Set sets the specified containerd option.
func (c *Config) Set(key string, value interface{}) {
config := *c.Tree
config.SetPath([]string{"plugins", c.CRIRuntimePluginName, key}, value)
*c.Tree = config
}
// DefaultRuntime returns the default runtime for the cri-o config // DefaultRuntime returns the default runtime for the cri-o config
func (c Config) DefaultRuntime() string { func (c Config) DefaultRuntime() string {
if runtime, ok := c.GetPath([]string{"plugins", c.CRIRuntimePluginName, "containerd", "default_runtime_name"}).(string); ok { if runtime, ok := c.GetPath([]string{"plugins", c.CRIRuntimePluginName, "containerd", "default_runtime_name"}).(string); ok {
@ -113,7 +106,9 @@ func (c Config) DefaultRuntime() string {
// EnableCDI sets the enable_cdi field in the Containerd config to true. // EnableCDI sets the enable_cdi field in the Containerd config to true.
func (c *Config) EnableCDI() { func (c *Config) EnableCDI() {
c.Set("enable_cdi", true) config := *c.Tree
config.SetPath([]string{"plugins", c.CRIRuntimePluginName, "enable_cdi"}, true)
*c.Tree = config
} }
// RemoveRuntime removes a runtime from the docker config // RemoveRuntime removes a runtime from the docker config

11
pkg/config/engine/containerd/config_v1.go
View File

@ -143,13 +143,6 @@ func (c *ConfigV1) RemoveRuntime(name string) error {
return nil return nil
} }
// Set sets the specified containerd option.
func (c *ConfigV1) Set(key string, value interface{}) {
config := *c.Tree
config.SetPath([]string{"plugins", "cri", "containerd", key}, value)
*c.Tree = config
}
// Save writes the config to a file // Save writes the config to a file
func (c ConfigV1) Save(path string) (int64, error) { func (c ConfigV1) Save(path string) (int64, error) {
return (Config)(c).Save(path) return (Config)(c).Save(path)
@ -167,5 +160,7 @@ func (c *ConfigV1) GetRuntimeConfig(name string) (engine.RuntimeConfig, error) {
} }
func (c *ConfigV1) EnableCDI() { func (c *ConfigV1) EnableCDI() {
c.Set("enable_cdi", true) config := *c.Tree
config.SetPath([]string{"plugins", "cri", "containerd", "enable_cdi"}, true)
*c.Tree = config
} }

7
pkg/config/engine/docker/docker.go
View File

@ -105,7 +105,7 @@ func (c Config) DefaultRuntime() string {
// EnableCDI sets features.cdi to true in the docker config. // EnableCDI sets features.cdi to true in the docker config.
func (c *Config) EnableCDI() { func (c *Config) EnableCDI() {
c.Set("features", map[string]bool{"cdi": true}) (*c)["features"] = map[string]bool{"cdi": true}
} }
// RemoveRuntime removes a runtime from the docker config // RemoveRuntime removes a runtime from the docker config
@ -137,11 +137,6 @@ func (c *Config) RemoveRuntime(name string) error {
return nil return nil
} }
// Set sets the specified docker option
func (c *Config) Set(key string, value interface{}) {
(*c)[key] = value
}
// Save writes the config to the specified path // Save writes the config to the specified path
func (c Config) Save(path string) (int64, error) { func (c Config) Save(path string) (int64, error) {
output, err := json.MarshalIndent(c, "", " ") output, err := json.MarshalIndent(c, "", " ")