ed47d6ba76
The rpc only reports one field, i.e. the cgroup driver, to kubelet. Containerd determines the effective cgroup driver by looking at all runtime handlers, starting from the default runtime handler (the rest in alphabetical order), and returning the cgroup driver setting of the first runtime handler that supports one. If no runtime handler supports cgroup driver (i.e. has a config option for it) containerd falls back to auto-detection, returning systemd if systemd is running and cgroupfs otherwise. This patch implements the CRI server side of Kubernetes KEP-4033: https://github.com/kubernetes/enhancements/tree/master/keps/sig-node/4033-group-driver-detection-over-cri Signed-off-by: Markus Lehtonen <markus.lehtonen@intel.com>
106 lines
3.3 KiB
Go
106 lines
3.3 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 server
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
|
|
criconfig "github.com/containerd/containerd/pkg/cri/config"
|
|
"github.com/containerd/containerd/plugin"
|
|
"github.com/opencontainers/runc/libcontainer/cgroups/systemd"
|
|
"github.com/stretchr/testify/assert"
|
|
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
|
|
)
|
|
|
|
func newFakeRuntimeConfig(runcV2, systemdCgroup bool) criconfig.Runtime {
|
|
r := criconfig.Runtime{Type: "default", Options: map[string]interface{}{}}
|
|
if runcV2 {
|
|
r.Type = plugin.RuntimeRuncV2
|
|
if systemdCgroup {
|
|
r.Options["SystemdCgroup"] = true
|
|
}
|
|
}
|
|
return r
|
|
}
|
|
|
|
func TestRuntimeConfig(t *testing.T) {
|
|
autoDetected := runtime.CgroupDriver_CGROUPFS
|
|
if systemd.IsRunningSystemd() {
|
|
autoDetected = runtime.CgroupDriver_SYSTEMD
|
|
}
|
|
|
|
for _, test := range []struct {
|
|
desc string
|
|
defaultRuntime string
|
|
runtimes map[string]criconfig.Runtime
|
|
expectedCgroupDriver runtime.CgroupDriver
|
|
}{
|
|
{
|
|
desc: "no runtimes",
|
|
expectedCgroupDriver: autoDetected,
|
|
},
|
|
{
|
|
desc: "non-runc runtime",
|
|
defaultRuntime: "non-runc",
|
|
runtimes: map[string]criconfig.Runtime{"non-runc": newFakeRuntimeConfig(false, false)},
|
|
expectedCgroupDriver: autoDetected,
|
|
},
|
|
{
|
|
desc: "no default, pick first in alphabetical order",
|
|
runtimes: map[string]criconfig.Runtime{
|
|
"non-runc": newFakeRuntimeConfig(false, false),
|
|
"runc-2": newFakeRuntimeConfig(true, true),
|
|
"runc": newFakeRuntimeConfig(true, false),
|
|
"non-runc-2": newFakeRuntimeConfig(false, false),
|
|
},
|
|
expectedCgroupDriver: runtime.CgroupDriver_CGROUPFS,
|
|
},
|
|
{
|
|
desc: "pick default, cgroupfs",
|
|
defaultRuntime: "runc-2",
|
|
runtimes: map[string]criconfig.Runtime{
|
|
"non-runc": newFakeRuntimeConfig(false, false),
|
|
"runc": newFakeRuntimeConfig(true, true),
|
|
"runc-2": newFakeRuntimeConfig(true, false),
|
|
},
|
|
expectedCgroupDriver: runtime.CgroupDriver_CGROUPFS,
|
|
},
|
|
{
|
|
desc: "pick default, systemd",
|
|
defaultRuntime: "runc-2",
|
|
runtimes: map[string]criconfig.Runtime{
|
|
"non-runc": newFakeRuntimeConfig(false, false),
|
|
"runc": newFakeRuntimeConfig(true, false),
|
|
"runc-2": newFakeRuntimeConfig(true, true),
|
|
},
|
|
expectedCgroupDriver: runtime.CgroupDriver_SYSTEMD,
|
|
},
|
|
} {
|
|
test := test
|
|
t.Run(test.desc, func(t *testing.T) {
|
|
c := newTestCRIService()
|
|
c.config.PluginConfig.ContainerdConfig.DefaultRuntimeName = test.defaultRuntime
|
|
c.config.PluginConfig.ContainerdConfig.Runtimes = test.runtimes
|
|
|
|
resp, err := c.RuntimeConfig(context.TODO(), &runtime.RuntimeConfigRequest{})
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, test.expectedCgroupDriver, resp.Linux.CgroupDriver, "got unexpected cgroup driver")
|
|
})
|
|
}
|
|
}
|