mirror of
https://github.com/containerd/containerd.git
synced 2026-11-06 13:27:16 +00:00
Samuel Karp
4f7de25abb
Remove the `enable_cdi` configuration option in `[plugins."io.containerd.cri.v1.runtime"]`, which was deprecated in v2.2. CDI support is now always enabled. Assisted-by: Antigravity Signed-off-by: Samuel Karp <samuelkarp@google.com>
84 lines
2.6 KiB
Go
84 lines
2.6 KiB
Go
/*
|
|
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 runtime
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/containerd/containerd/v2/plugins"
|
|
)
|
|
|
|
func TestCRIRuntimePluginConfigMigration(t *testing.T) {
|
|
runcSandboxer := "podsandbox"
|
|
cniBinDir := "/opt/cni/bin"
|
|
|
|
grpcCri := map[string]any{
|
|
"enable_selinux": true,
|
|
"max_container_log_line_size": 100,
|
|
"max_concurrent_downloads": 3, // removed since it's moved to cri image service
|
|
"disable_tcp_service": true, // removed since it's moved to cri grpc service
|
|
"enable_cdi": true,
|
|
"containerd": map[string]any{
|
|
"runtimes": map[string]any{
|
|
"runc": map[string]any{
|
|
"sandbox_mode": runcSandboxer,
|
|
},
|
|
},
|
|
},
|
|
"cni": map[string]any{
|
|
"bin_dir": cniBinDir,
|
|
},
|
|
}
|
|
|
|
pluginConfigs := map[string]any{
|
|
string(plugins.GRPCPlugin) + ".cri": grpcCri,
|
|
}
|
|
configMigration(context.Background(), 2, pluginConfigs)
|
|
|
|
runtimeConf, ok := pluginConfigs[string(plugins.CRIServicePlugin)+".runtime"].(map[string]any)
|
|
require.True(t, ok)
|
|
require.NotNil(t, runtimeConf)
|
|
assert.Equal(t, grpcCri["enable_selinux"], runtimeConf["enable_selinux"])
|
|
assert.Equal(t, grpcCri["max_container_log_line_size"], runtimeConf["max_container_log_line_size"])
|
|
assert.NotContains(t, runtimeConf, "max_concurrent_downloads")
|
|
assert.NotContains(t, runtimeConf, "disable_tcp_service")
|
|
assert.NotContains(t, runtimeConf, "enable_cdi")
|
|
|
|
ctd, ok := runtimeConf["containerd"].(map[string]any)
|
|
require.True(t, ok)
|
|
require.NotNil(t, ctd)
|
|
|
|
runtimes := ctd["runtimes"].(map[string]any)
|
|
runc, ok := runtimes["runc"].(map[string]any)
|
|
require.True(t, ok)
|
|
require.NotNil(t, runc)
|
|
assert.Equal(t, runcSandboxer, runc["sandboxer"])
|
|
assert.NotContains(t, runc, "sandbox_mode")
|
|
|
|
cni, ok := runtimeConf["cni"].(map[string]any)
|
|
require.True(t, ok)
|
|
require.NotNil(t, cni)
|
|
cniBinDirs, ok := cni["bin_dirs"].([]string)
|
|
require.True(t, ok)
|
|
require.Len(t, cniBinDirs, 1)
|
|
require.Equal(t, cniBinDir, cniBinDirs[0])
|
|
}
|