Merge pull request #5604 from ktock/nvidiacgroups

estesp · web-flow · commit 0a3a77bc4453 · 2021-06-14T14:35:00.000-04:00
Allow to pass --no-cgroups option to nvidia-container-cli
diff --git a/contrib/nvidia/nvidia.go b/contrib/nvidia/nvidia.go
@@ -111,6 +111,7 @@ type config struct {
 	LDConfig     string
 	Requirements []string
 	OCIHookPath  string
+	NoCgroups    bool
 }
 
 func (c *config) args() []string {
@@ -137,6 +138,9 @@ func (c *config) args() []string {
 	for _, r := range c.Requirements {
 		args = append(args, fmt.Sprintf("--require=%s", r))
 	}
+	if c.NoCgroups {
+		args = append(args, "--no-cgroups")
+	}
 	args = append(args, "--pid={{pid}}", "{{rootfs}}")
 	return args
 }
@@ -209,3 +213,9 @@ func WithLookupOCIHookPath(name string) Opts {
 		return nil
 	}
 }
+
+// WithNoCgroups passes --no-cgroups option to nvidia-container-cli.
+func WithNoCgroups(c *config) error {
+	c.NoCgroups = true
+	return nil
+}

Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,7 @@ type config struct {`
`111`	`111`	`LDConfig string`
`112`	`112`	`Requirements []string`
`113`	`113`	`OCIHookPath string`
	`114`	`+ NoCgroups bool`
`114`	`115`	`}`
`115`	`116`
`116`	`117`	`func (c *config) args() []string {`
`@@ -137,6 +138,9 @@ func (c *config) args() []string {`
`137`	`138`	`for _, r := range c.Requirements {`
`138`	`139`	`args = append(args, fmt.Sprintf("--require=%s", r))`
`139`	`140`	`}`
	`141`	`+ if c.NoCgroups {`
	`142`	`+ args = append(args, "--no-cgroups")`
	`143`	`+ }`
`140`	`144`	`args = append(args, "--pid={{pid}}", "{{rootfs}}")`
`141`	`145`	`return args`
`142`	`146`	`}`
`@@ -209,3 +213,9 @@ func WithLookupOCIHookPath(name string) Opts {`
`209`	`213`	`return nil`
`210`	`214`	`}`
`211`	`215`	`}`
	`216`	`+`
	`217`	`+// WithNoCgroups passes --no-cgroups option to nvidia-container-cli.`
	`218`	`+func WithNoCgroups(c *config) error {`
	`219`	`+ c.NoCgroups = true`
	`220`	`+ return nil`
	`221`	`+}`