address recent runtimes config confusion

Signed-off-by: Mike Brown <[email protected]>
jedieaston · Apr 12, 2021 · 8a04bd0 · 8a04bd0
1 parent e96d2a5
commit 8a04bd0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/cri/config/config.go b/pkg/cri/config/config.go
@@ -328,7 +328,7 @@ func ValidatePluginConfig(ctx context.Context, c *PluginConfig) error {
 		return errors.New("`default_runtime_name` is empty")
 	}
 	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.

diff --git a/pkg/cri/config/config_test.go b/pkg/cri/config/config_test.go
@@ -113,7 +113,7 @@ func TestValidateConfig(t *testing.T) {
 					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": {
 			config: &PluginConfig{