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

address recent runtimes config confusion

Browse Source 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
This commit is contained in:
Mike Brown 2021-04-12 13:52:27 -05:00
parent e96d2a5d90
commit 8a04bd0521
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cri/config/config.go
View File

@ -328,7 +328,7 @@ func ValidatePluginConfig(ctx context.Context, c *PluginConfig) error {
return errors.New("`default_runtime_name` is empty") return errors.New("`default_runtime_name` is empty")
} }
if _, ok := c.ContainerdConfig.Runtimes[c.ContainerdConfig.DefaultRuntimeName]; !ok { if _, ok := c.ContainerdConfig.Runtimes[c.ContainerdConfig.DefaultRuntimeName]; !ok {
return errors.New("no corresponding runtime configured in `runtimes` for `default_runtime_name`") return errors.Errorf("no corresponding runtime configured in `containerd.runtimes` for `containerd` `default_runtime_name = \"%s\"", c.ContainerdConfig.DefaultRuntimeName)
} }
// Validation for deprecated runtime options. // Validation for deprecated runtime options.

2
pkg/cri/config/config_test.go
View File

@ -113,7 +113,7 @@ func TestValidateConfig(t *testing.T) {
DefaultRuntimeName: RuntimeDefault, DefaultRuntimeName: RuntimeDefault,
}, },
}, },
expectedErr: "no corresponding runtime configured in `runtimes` for `default_runtime_name`", expectedErr: "no corresponding runtime configured in `containerd.runtimes` for `containerd` `default_runtime_name = \"default\"",
}, },
"deprecated systemd_cgroup for v1 runtime": { "deprecated systemd_cgroup for v1 runtime": {
config: &PluginConfig{ config: &PluginConfig{