Merge pull request containerd#9847 from akhilerm/replace-prestart-oci-hook

mxpv · web-flow · commit d32dc0e76d58 · 2024-02-20T21:51:02.000Z
replace deprecated Prestart to CreateRuntime hook
diff --git a/contrib/nvidia/nvidia.go b/contrib/nvidia/nvidia.go
@@ -87,7 +87,7 @@ func WithGPUs(opts ...Opts) oci.SpecOpts {
 		if s.Hooks == nil {
 			s.Hooks = &specs.Hooks{}
 		}
-		s.Hooks.Prestart = append(s.Hooks.Prestart, specs.Hook{
+		s.Hooks.CreateRuntime = append(s.Hooks.CreateRuntime, specs.Hook{
 			Path: c.OCIHookPath,
 			Args: append([]string{
 				"containerd",
diff --git a/integration/client/container_test.go b/integration/client/container_test.go
@@ -1737,7 +1737,7 @@ func TestContainerHook(t *testing.T) {
 		if err != nil {
 			return err
 		}
-		s.Hooks.Prestart = []specs.Hook{
+		s.Hooks.CreateRuntime = []specs.Hook{
 			{
 				Path: path,
 				Args: []string{

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ func WithGPUs(opts ...Opts) oci.SpecOpts {`
`87`	`87`	`if s.Hooks == nil {`
`88`	`88`	`s.Hooks = &specs.Hooks{}`
`89`	`89`	`}`
`90`		`- s.Hooks.Prestart = append(s.Hooks.Prestart, specs.Hook{`
	`90`	`+ s.Hooks.CreateRuntime = append(s.Hooks.CreateRuntime, specs.Hook{`
`91`	`91`	`Path: c.OCIHookPath,`
`92`	`92`	`Args: append([]string{`
`93`	`93`	`"containerd",`
Original file line number	Diff line number	Diff line change
`@@ -1737,7 +1737,7 @@ func TestContainerHook(t *testing.T) {`
`1737`	`1737`	`if err != nil {`
`1738`	`1738`	`return err`
`1739`	`1739`	`}`
`1740`		`- s.Hooks.Prestart = []specs.Hook{`
	`1740`	`+ s.Hooks.CreateRuntime = []specs.Hook{`
`1741`	`1741`	`{`
`1742`	`1742`	`Path: path,`
`1743`	`1743`	`Args: []string{`