tasks: emit warning for runc v1 runtime

samuelkarp · samuelkarp · commit f471bb2b8e5a · 2023-11-30T23:33:31.000-08:00
Signed-off-by: Samuel Karp &lt;samuelkarp@google.com&gt;
diff --git a/pkg/deprecation/deprecation.go b/pkg/deprecation/deprecation.go
@@ -37,6 +37,8 @@ const (
 	AUFSSnapshotter Warning = Prefix + "aufs-snapshotter"
 	// RuntimeV1 is a warning for the io.containerd.runtime.v1.linux runtime
 	RuntimeV1 Warning = Prefix + "runtime-v1"
+	// RuntimeRuncV1 is a warning for the io.containerd.runc.v1 runtime
+	RuntimeRuncV1 Warning = Prefix + "runtime-runc-v1"
 )
 
 var messages = map[Warning]string{
@@ -52,6 +54,7 @@ var messages = map[Warning]string{
 	CRIAPIV1Alpha2:  "CRI API v1alpha2 is deprecated since containerd v1.7 and removed in containerd v2.0. Use CRI API v1 instead.",
 	AUFSSnapshotter: "The aufs snapshotter is deprecated since containerd v1.5 and removed in containerd v2.0. Use the overlay snapshotter instead.",
 	RuntimeV1:       "The `io.containerd.runtime.v1.linux` runtime is deprecated since containerd v1.4 and removed in containerd v2.0. Use the `io.containerd.runc.v2` runtime instead.",
+	RuntimeRuncV1:   "The `io.containerd.runc.v1` runtime is deprecated since containerd v1.4 and removed in containerd v2.0. Use the `io.containerd.runc.v2` runtime instead.",
 }
 
 // Valid checks whether a given Warning is valid
diff --git a/services/tasks/local.go b/services/tasks/local.go
@@ -231,9 +231,6 @@ func (l *local) Create(ctx context.Context, r *api.CreateTaskRequest, _ ...grpc.
 			Options: m.Options,
 		})
 	}
-	if container.Runtime.Name == plugin.RuntimeRuncV1 {
-		log.G(ctx).Warnf("%q is deprecated since containerd v1.4, consider using %q", plugin.RuntimeRuncV1, plugin.RuntimeRuncV2)
-	}
 	l.emitRuntimeWarning(ctx, container.Runtime.Name)
 	rtime, err := l.getRuntime(container.Runtime.Name)
 	if err != nil {
@@ -269,6 +266,9 @@ func (l *local) emitRuntimeWarning(ctx context.Context, runtime string) {
 	case plugin.RuntimeLinuxV1:
 		log.G(ctx).Warnf("%q is deprecated since containerd v1.4 and will be removed in containerd v2.0, use %q instead", plugin.RuntimeLinuxV1, plugin.RuntimeRuncV2)
 		l.warnings.Emit(ctx, deprecation.RuntimeV1)
+	case plugin.RuntimeRuncV1:
+		log.G(ctx).Warnf("%q is deprecated since containerd v1.4 and will be removed in containerd v2.0, use %q instead", plugin.RuntimeRuncV1, plugin.RuntimeRuncV2)
+		l.warnings.Emit(ctx, deprecation.RuntimeRuncV1)
 	}
 }
 func (l *local) Start(ctx context.Context, r *api.StartRequest, _ ...grpc.CallOption) (*api.StartResponse, error) {

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,8 @@ const (`
`37`	`37`	`AUFSSnapshotter Warning = Prefix + "aufs-snapshotter"`
`38`	`38`	`// RuntimeV1 is a warning for the io.containerd.runtime.v1.linux runtime`
`39`	`39`	`RuntimeV1 Warning = Prefix + "runtime-v1"`
	`40`	`+ // RuntimeRuncV1 is a warning for the io.containerd.runc.v1 runtime`
	`41`	`+ RuntimeRuncV1 Warning = Prefix + "runtime-runc-v1"`
`40`	`42`	`)`
`41`	`43`
`42`	`44`	`var messages = map[Warning]string{`
`@@ -52,6 +54,7 @@ var messages = map[Warning]string{`
`52`	`54`	`CRIAPIV1Alpha2: "CRI API v1alpha2 is deprecated since containerd v1.7 and removed in containerd v2.0. Use CRI API v1 instead.",`
`53`	`55`	`AUFSSnapshotter: "The aufs snapshotter is deprecated since containerd v1.5 and removed in containerd v2.0. Use the overlay snapshotter instead.",`
`54`	`56`	RuntimeV1: "The `io.containerd.runtime.v1.linux` runtime is deprecated since containerd v1.4 and removed in containerd v2.0. Use the `io.containerd.runc.v2` runtime instead.",
	`57`	+ RuntimeRuncV1: "The `io.containerd.runc.v1` runtime is deprecated since containerd v1.4 and removed in containerd v2.0. Use the `io.containerd.runc.v2` runtime instead.",
`55`	`58`	`}`
`56`	`59`
`57`	`60`	`// Valid checks whether a given Warning is valid`
Original file line number	Diff line number	Diff line change
`@@ -231,9 +231,6 @@ func (l local) Create(ctx context.Context, r api.CreateTaskRequest, _ ...grpc.`
`231`	`231`	`Options: m.Options,`
`232`	`232`	`})`
`233`	`233`	`}`
`234`		`- if container.Runtime.Name == plugin.RuntimeRuncV1 {`
`235`		`- log.G(ctx).Warnf("%q is deprecated since containerd v1.4, consider using %q", plugin.RuntimeRuncV1, plugin.RuntimeRuncV2)`
`236`		`- }`
`237`	`234`	`l.emitRuntimeWarning(ctx, container.Runtime.Name)`
`238`	`235`	`rtime, err := l.getRuntime(container.Runtime.Name)`
`239`	`236`	`if err != nil {`
`@@ -269,6 +266,9 @@ func (l *local) emitRuntimeWarning(ctx context.Context, runtime string) {`
`269`	`266`	`case plugin.RuntimeLinuxV1:`
`270`	`267`	`log.G(ctx).Warnf("%q is deprecated since containerd v1.4 and will be removed in containerd v2.0, use %q instead", plugin.RuntimeLinuxV1, plugin.RuntimeRuncV2)`
`271`	`268`	`l.warnings.Emit(ctx, deprecation.RuntimeV1)`
	`269`	`+ case plugin.RuntimeRuncV1:`
	`270`	`+ log.G(ctx).Warnf("%q is deprecated since containerd v1.4 and will be removed in containerd v2.0, use %q instead", plugin.RuntimeRuncV1, plugin.RuntimeRuncV2)`
	`271`	`+ l.warnings.Emit(ctx, deprecation.RuntimeRuncV1)`
`272`	`272`	`}`
`273`	`273`	`}`
`274`	`274`	`func (l local) Start(ctx context.Context, r api.StartRequest, _ ...grpc.CallOption) (*api.StartResponse, error) {`