Merge pull request #4568 from twz123/containerd-toml-lowercase-version

Set correct version number in containerd CRI config
k0sproject · Jun 7, 2024 · 4d24f74 · 4d24f74
2 parents 9d82f80 + 15b0427
commit 4d24f74
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/pkg/component/worker/containerd/configurer.go b/pkg/component/worker/containerd/configurer.go
@@ -114,7 +114,7 @@ func generateDefaultCRIConfig(sandboxContainerImage string) ([]byte, error) {
 	}
 	// We need to use custom struct so we can unmarshal the CRI plugin config only
 	containerdConfig := struct {
-		Version int
+		Version int                    `toml:"version"`
 		Plugins map[string]interface{} `toml:"plugins"`
 	}{
 		Version: 2,

diff --git a/pkg/component/worker/containerd/configurer_test.go b/pkg/component/worker/containerd/configurer_test.go
@@ -57,6 +57,7 @@ func TestConfigurer_HandleImports(t *testing.T) {
 		var containerdConfig serverconfig.Config
 		require.NoError(t, serverconfig.LoadConfig(criConfigPath, &containerdConfig))
 
+		assert.Equal(t, 2, containerdConfig.Version)
 		criPluginConfig := containerdConfig.Plugins["io.containerd.grpc.v1.cri"]
 		require.NotNil(t, criPluginConfig, "No CRI plugin configuration section found")
 		snapshotter := criPluginConfig.GetPath([]string{"containerd", "snapshotter"})