Merge branch 'debug-no-cgroups' into 'main'

Add required option to new toml config

See merge request nvidia/container-toolkit/container-toolkit!476

CHANGELOG.md

@@ -1,5 +1,9 @@
 # NVIDIA Container Toolkit Changelog
 
+## v1.14.1
+* Use libelf.so on RPM-based systems due to removed mageia repositories hosting pmake and bmake.
+* Fixed bug where contents of `/etc/nvidia-container-runtime/config.toml` is ignored by the NVIDIA Container Runtime Hook.
+
 ## v1.14.0
 * Promote v1.14.0-rc.3 to v1.14.0
 

cmd/nvidia-container-runtime-hook/hook_config.go

@@ -45,6 +45,7 @@ func loadConfig() (*config.Config, error) {
 	for _, p := range configPaths {
 		cfg, err := config.New(
 			config.WithConfigFile(p),
+			config.WithRequired(true),
 		)
 		if err == nil {
 			return cfg.Config()

internal/config/toml.go

@@ -31,6 +31,7 @@ type Toml toml.Tree
 
 type options struct {
 	configFile string
+	required   bool
 }
 
 // Option is a functional option for loading TOML config files.
@@ -43,6 +44,14 @@ func WithConfigFile(configFile string) Option {
 	}
 }
 
+// WithRequired sets the required option.
+// If this is set to true, a failure to open the specified file is treated as an error
+func WithRequired(required bool) Option {
+	return func(o *options) {
+		o.required = required
+	}
+}
+
 // New creates a new toml tree based on the provided options
 func New(opts ...Option) (*Toml, error) {
 	o := &options{}
@@ -50,19 +59,25 @@ func New(opts ...Option) (*Toml, error) {
 		opt(o)
 	}
 
-	return loadConfigToml(o.configFile)
+	return o.loadConfigToml()
 }
 
-func loadConfigToml(filename string) (*Toml, error) {
+func (o options) loadConfigToml() (*Toml, error) {
+	filename := o.configFile
 	if filename == "" {
 		return defaultToml()
 	}
 
+	_, err := os.Stat(filename)
+	if os.IsNotExist(err) && o.required {
+		return nil, os.ErrNotExist
+	}
+
 	tomlFile, err := os.Open(filename)
 	if os.IsNotExist(err) {
 		return defaultToml()
 	} else if err != nil {
-		return nil, fmt.Errorf("failed to load specified config file: %v", err)
+		return nil, fmt.Errorf("failed to load specified config file: %w", err)
 	}
 	defer tomlFile.Close()
 

third_party/libnvidia-container

@@ -1 +1 @@
-Subproject commit 6a24508dff6cb36841114ff4c1287cd29ded72af
+Subproject commit 86b6e51145f2a53257658682b7ae8e24f39e6649

versions.mk

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 LIB_NAME := nvidia-container-toolkit
-LIB_VERSION := 1.14.0
+LIB_VERSION := 1.14.1
 LIB_TAG :=
 
 # The package version is the combination of the library version and tag.