github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #4384 from AkihiroSuda/deprecate-legacy-shims

Browse Source 
Deprecate legacy shims
This commit is contained in:
Derek McGowan
2020-07-29 11:30:09 -07:00
committed by GitHub
parent 40b22ef074 04b98bb0ee
commit d4b17275d6
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
RELEASES.md
View File

@@ -309,3 +309,12 @@ in that process. Container root file systems will be maintained on upgrade.
We may make exceptions in the interest of __security patches__. If a break is We may make exceptions in the interest of __security patches__. If a break is
required, it will be communicated clearly and the solution will be considered required, it will be communicated clearly and the solution will be considered
against total impact. against total impact.
## Deprecated features
The deprecated features are shown in the following table:
| Component | Deprecation release | Target release for removal |
|----------------------------------------------------------------------|---------------------|----------------------------|
| Runtime V1 API and implementation (`io.containerd.runtime.v1.linux`) | containerd v1.4 | containerd v2.0 |
| Runc V1 implementation of Runtime V2 (`io.containerd.runc.v1`) | containerd v1.4 | containerd v2.0 |

5
services/tasks/local.go
View File

@@ -184,6 +184,11 @@ func (l *local) Create(ctx context.Context, r *api.CreateTaskRequest, _ ...grpc.
Options: m.Options, Options: m.Options,
}) })
} }
if strings.HasPrefix(container.Runtime.Name, "io.containerd.runtime.v1.") {
log.G(ctx).Warn("runtime v1 is deprecated since containerd v1.4, consider using runtime v2")
} else if container.Runtime.Name == plugin.RuntimeRuncV1 {
log.G(ctx).Warnf("%q is deprecated since containerd v1.4, consider using %q", plugin.RuntimeRuncV1, plugin.RuntimeRuncV2)
}
rtime, err := l.getRuntime(container.Runtime.Name) rtime, err := l.getRuntime(container.Runtime.Name)
if err != nil { if err != nil {
return nil, err return nil, err