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

chore: add a build tag to disable containerd plugin import

Browse Source 
Signed-off-by: Pierre Gimalac <pierre.gimalac@datadoghq.com>
This commit is contained in:
Pierre Gimalac
2024-12-31 13:39:34 +01:00
parent fb61c901db
commit dca769485c
4 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/containerd/server/server.go
View File

@@ -51,7 +51,6 @@ import (
ssapi "github.com/containerd/containerd/api/services/snapshots/v1"
"github.com/containerd/platforms"
"github.com/containerd/plugin"
"github.com/containerd/plugin/dynamic"
"github.com/containerd/plugin/registry"
srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config"
@@ -476,7 +475,7 @@ func LoadPlugins(ctx context.Context, config *srvconfig.Config) ([]plugin.Regist
if path == "" {
path = filepath.Join(config.Root, "plugins")
}
if count, err := dynamic.Load(path); err != nil {
if count, err := loadDynamic(path); err != nil {
return nil, err
} else if count > 0 || config.PluginDir != "" { //nolint:staticcheck
config.PluginDir = path //nolint:staticcheck

24
cmd/containerd/server/server_no_plugins.go Normal file
View File

@@ -0,0 +1,24 @@
//go:build no_dynamic_plugins
/*
Copyright The containerd Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package server
func loadDynamic(string) (loaded int, _ error) {
// dynamic plugins disabled through no_dynamic_plugins build-tag
return 0, nil
}

25
cmd/containerd/server/server_plugins.go Normal file
View File

@@ -0,0 +1,25 @@
//go:build !no_dynamic_plugins
/*
Copyright The containerd Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package server
import "github.com/containerd/plugin/dynamic"
func loadDynamic(path string) (loaded int, _ error) {
return dynamic.Load(path)
}