Merge pull request #1354 from elezar/optional-explicit-libraries

Make list of explicit driver libraries opt-in

Author: elezar

pkg/nvcdi/api.go

@@ -77,6 +77,9 @@ const (
 type FeatureFlag string
 
 const (
+	// FeatureEnableExplicitDriverLibraries enables the inclusion of a list of
+	// explicit driver libraries.
+	FeatureEnableExplicitDriverLibraries = FeatureFlag("enable-explicit-driver-libraries")
 	// FeatureDisableNvsandboxUtils disables the use of nvsandboxutils when
 	// querying devices.
 	FeatureDisableNvsandboxUtils = FeatureFlag("disable-nvsandbox-utils")

pkg/nvcdi/driver-nvml.go

@@ -145,6 +145,10 @@ func (l *nvcdilib) getVersionSuffixDriverLibraryMounts(version string) (discover
 }
 
 func (l *nvcdilib) getExplicitDriverLibraryMounts() (discover.Discover, error) {
+	if !l.featureFlags[FeatureEnableExplicitDriverLibraries] {
+		return nil, nil
+	}
+
 	// List of explicit libraries to locate
 	// TODO(ArangoGutierrez): we should load the version of the libraries from
 	// the sandboxutils-filelist or have a way to allow users to specify the

tests/e2e/installer.go

@@ -82,6 +82,9 @@ func NewToolkitInstaller(opts ...installerOption) (*ToolkitInstaller, error) {
 // PrepareCache ensures that the installer (package) cache is created on the runner.
 // The can be used to ensure that docker is not REQUIRED in an inner container.
 func (i *ToolkitInstaller) PrepareCache(runner Runner) (string, string, error) {
+	if i.ToolkitImage == "disabled:disabled" {
+		return "", "", nil
+	}
 	renderedScript, err := i.renderScript(prepareInstallerCacheTemplate, false)
 	if err != nil {
 		return "", "", err

tests/e2e/nvidia-container-toolkit_test.go

@@ -516,4 +516,21 @@ EOF`)
 			Expect(strings.TrimSpace(stdout)).To(Equal("Unsuccessful"))
 		})
 	})
+
+	When("Running a container that installs ocl-icd-libopencl1", Ordered, func() {
+		BeforeAll(func(ctx context.Context) {
+			_, _, err := runner.Run("docker pull ubuntu")
+			Expect(err).ToNot(HaveOccurred())
+		})
+		It("should succeed when using the nvidia-container-runtime", func(ctx context.Context) {
+			_, _, err := runner.Run(`docker run --rm --runtime=nvidia -e NVIDIA_VISIBLE_DEVICES=all -e NVIDIA_DRIVER_CAPABILITIES=all \
+				ubuntu bash -c "apt-get update && apt-get install -y ocl-icd-libopencl1"`)
+			Expect(err).ToNot(HaveOccurred())
+		})
+		It("should succeed when using the nvidia-container-runtime-hook", Label("legacy"), func(ctx context.Context) {
+			_, _, err := runner.Run(`docker run --rm --runtime=runc --gpus=all -e NVIDIA_DRIVER_CAPABILITIES=all \
+				ubuntu bash -c "apt-get update && apt-get install -y ocl-icd-libopencl1"`)
+			Expect(err).ToNot(HaveOccurred())
+		})
+	})
 })