Merge pull request containerd#5342 from mikebrow/improve-error-out-for-bad-config

estesp · web-flow · commit 68ee827dcd6d · 2021-04-12T20:40:10.000-04:00
address recent runtimes config confusion
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{

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