mirror of
				https://github.com/NVIDIA/nvidia-container-toolkit
				synced 2025-06-26 18:18:24 +00:00 
			
		
		
		
	Add new config options to pull device list from mounted files not ENVVAR
Signed-off-by: Kevin Klues <kklues@nvidia.com>
This commit is contained in:
		
							parent
							
								
									b9ef2db205
								
							
						
					
					
						commit
						da36874e91
					
				| @ -1,5 +1,7 @@ | ||||
| disable-require = false | ||||
| #swarm-resource = "DOCKER_RESOURCE_GPU" | ||||
| #accept-nvidia-visible-devices-envvar-when-unprivileged = true | ||||
| #look-for-nvidia-visible-devices-as-volume-mounts-under = "/var/run/nvidia-container-devices" | ||||
| 
 | ||||
| [nvidia-container-cli] | ||||
| #root = "/run/nvidia/driver" | ||||
|  | ||||
| @ -1,5 +1,7 @@ | ||||
| disable-require = false | ||||
| #swarm-resource = "DOCKER_RESOURCE_GPU" | ||||
| #accept-nvidia-visible-devices-envvar-when-unprivileged = true | ||||
| #look-for-nvidia-visible-devices-as-volume-mounts-under = "/var/run/nvidia-container-devices" | ||||
| 
 | ||||
| [nvidia-container-cli] | ||||
| #root = "/run/nvidia/driver" | ||||
|  | ||||
| @ -1,5 +1,7 @@ | ||||
| disable-require = false | ||||
| #swarm-resource = "DOCKER_RESOURCE_GPU" | ||||
| #accept-nvidia-visible-devices-envvar-when-unprivileged = true | ||||
| #look-for-nvidia-visible-devices-as-volume-mounts-under = "/var/run/nvidia-container-devices" | ||||
| 
 | ||||
| [nvidia-container-cli] | ||||
| #root = "/run/nvidia/driver" | ||||
|  | ||||
| @ -1,5 +1,7 @@ | ||||
| disable-require = false | ||||
| #swarm-resource = "DOCKER_RESOURCE_GPU" | ||||
| #accept-nvidia-visible-devices-envvar-when-unprivileged = true | ||||
| #look-for-nvidia-visible-devices-as-volume-mounts-under = "/var/run/nvidia-container-devices" | ||||
| 
 | ||||
| [nvidia-container-cli] | ||||
| #root = "/run/nvidia/driver" | ||||
|  | ||||
| @ -1,5 +1,7 @@ | ||||
| disable-require = false | ||||
| #swarm-resource = "DOCKER_RESOURCE_GPU" | ||||
| #accept-nvidia-visible-devices-envvar-when-unprivileged = true | ||||
| #look-for-nvidia-visible-devices-as-volume-mounts-under = "/var/run/nvidia-container-devices" | ||||
| 
 | ||||
| [nvidia-container-cli] | ||||
| #root = "/run/nvidia/driver" | ||||
|  | ||||
| @ -13,6 +13,10 @@ const ( | ||||
| 	driverPath = "/run/nvidia/driver" | ||||
| ) | ||||
| 
 | ||||
| const ( | ||||
| 	defaultDeviceListVolumeMount = "/var/run/nvidia-container-devices" | ||||
| ) | ||||
| 
 | ||||
| var defaultPaths = [...]string{ | ||||
| 	path.Join(driverPath, configPath), | ||||
| 	configPath, | ||||
| @ -34,16 +38,20 @@ type CLIConfig struct { | ||||
| 
 | ||||
| // HookConfig : options for the nvidia-container-toolkit.
 | ||||
| type HookConfig struct { | ||||
| 	DisableRequire bool    `toml:"disable-require"` | ||||
| 	SwarmResource  *string `toml:"swarm-resource"` | ||||
| 	DisableRequire           bool    `toml:"disable-require"` | ||||
| 	SwarmResource            *string `toml:"swarm-resource"` | ||||
| 	AcceptEnvvarUnprivileged bool    `toml:"accept-nvidia-visible-devices-envvar-when-unprivileged"` | ||||
| 	DeviceListVolumeMount    *string `toml:"look-for-nvidia-visible-devices-as-volume-mounts-under"` | ||||
| 
 | ||||
| 	NvidiaContainerCLI CLIConfig `toml:"nvidia-container-cli"` | ||||
| } | ||||
| 
 | ||||
| func getDefaultHookConfig() (config HookConfig) { | ||||
| 	return HookConfig{ | ||||
| 		DisableRequire: false, | ||||
| 		SwarmResource:  nil, | ||||
| 		DisableRequire:           false, | ||||
| 		SwarmResource:            nil, | ||||
| 		AcceptEnvvarUnprivileged: true, | ||||
| 		DeviceListVolumeMount:    &[]string{defaultDeviceListVolumeMount}[0], | ||||
| 		NvidiaContainerCLI: CLIConfig{ | ||||
| 			Root:        nil, | ||||
| 			Path:        nil, | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user