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

Merge pull request #9238 from fuweid/deprecated-go-plugin

Browse Source
This commit is contained in:
Samuel Karp 2023-10-15 22:15:56 -07:00 committed by GitHub
commit dbe82b7f6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
RELEASES.md
View File

@ -406,6 +406,7 @@ The deprecated features are shown in the following table:
| Pulling Schema 1 images (`application/vnd.docker.distribution.manifest.v1+json`) | containerd v1.7 | containerd v2.0 | Use Schema 2 or OCI images | | Pulling Schema 1 images (`application/vnd.docker.distribution.manifest.v1+json`) | containerd v1.7 | containerd v2.0 | Use Schema 2 or OCI images |
| CRI `v1alpha2` | containerd v1.7 | containerd v2.0 ✅ | Use CRI `v1` | | CRI `v1alpha2` | containerd v1.7 | containerd v2.0 ✅ | Use CRI `v1` |
| Legacy CRI implementation of podsandbox support | containerd v2.0 | containerd v2.0 ✅ | | | Legacy CRI implementation of podsandbox support | containerd v2.0 | containerd v2.0 ✅ | |
| Go-Plugin library (`*.so`) as containerd runtime plugin | containerd v2.0 | containerd v2.1 | Use external plugins (proxy or binary) |
### Deprecated config properties ### Deprecated config properties

2
services/server/config/config.go
View File

@ -63,6 +63,8 @@ type Config struct {
// TempDir is the path to a directory where to place containerd temporary files // TempDir is the path to a directory where to place containerd temporary files
TempDir string `toml:"temp"` TempDir string `toml:"temp"`
// PluginDir is the directory for dynamic plugins to be stored // PluginDir is the directory for dynamic plugins to be stored
//
// Deprecated: Please use proxy or binary external plugins.
PluginDir string `toml:"plugin_dir"` PluginDir string `toml:"plugin_dir"`
// GRPC configuration settings // GRPC configuration settings
GRPC GRPCConfig `toml:"grpc"` GRPC GRPCConfig `toml:"grpc"`

3
services/server/server.go
View File

@ -431,10 +431,11 @@ func (s *Server) Wait() {
// of all plugins. // of all plugins.
func LoadPlugins(ctx context.Context, config *srvconfig.Config) ([]plugin.Registration, error) { func LoadPlugins(ctx context.Context, config *srvconfig.Config) ([]plugin.Registration, error) {
// load all plugins into containerd // load all plugins into containerd
path := config.PluginDir path := config.PluginDir //nolint: staticcheck
if path == "" { if path == "" {
path = filepath.Join(config.Root, "plugins") path = filepath.Join(config.Root, "plugins")
} }
log.G(ctx).Warning("`go_plugin` is deprecated, please use `external plugins` instead")
if err := dynamic.Load(path); err != nil { if err := dynamic.Load(path); err != nil {
return nil, err return nil, err
} }