Skip to content

[pull] main from containerd:main #246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 3 commits into from
Feb 19, 2026
Merged

[pull] main from containerd:main #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21248d0
add check on version of drop in configs
akhilerm Feb 12, 2026
d40192b
assert exact error while loading drop in config
akhilerm Feb 19, 2026
b339be4
Merge pull request #12891 from akhilerm/fix-drop-in-config-version
dmcgowan Feb 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions cmd/containerd/server/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,8 +292,9 @@ func LoadConfig(ctx context.Context, path string, out *Config) error {
}

var (
loaded = map[string]bool{}
pending = []string{path}
loaded = map[string]bool{}
pending = []string{path}
rootConfigVersion = 0
)

for len(pending) > 0 {
Expand All @@ -309,6 +310,14 @@ func LoadConfig(ctx context.Context, path string, out *Config) error {
return err
}

// Check to make sure drop-in configs does not have a higher version than the root config version
if rootConfigVersion == 0 {
rootConfigVersion = config.Version
}
if config.Version > rootConfigVersion {
return fmt.Errorf("drop-in config version %d higher than root config version %d", config.Version, rootConfigVersion)
}

switch config.Version {
case 0, 1:
if err := config.MigrateConfigTo(ctx, out.Version); err != nil {
Expand Down
24 changes: 24 additions & 0 deletions cmd/containerd/server/config/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,30 @@ imports = ["data1.toml", "data2.toml"]
}, out.Imports)
}

func TestLoadConfigWithImportsWithHigerVersion(t *testing.T) {
data1 := `
version = 2
root = "/var/lib/containerd"
imports = ["data2.toml"]
`

data2 := `
version = 3
disabled_plugins = ["io.containerd.v1.xyz"]
`
tempDir := t.TempDir()

err := os.WriteFile(filepath.Join(tempDir, "data1.toml"), []byte(data1), 0o600)
assert.NoError(t, err)

err = os.WriteFile(filepath.Join(tempDir, "data2.toml"), []byte(data2), 0o600)
assert.NoError(t, err)

var out Config
err = LoadConfig(context.Background(), filepath.Join(tempDir, "data1.toml"), &out)
assert.Errorf(t, err, "drop-in config version 3 higher than root config version 2")
}

// https://github.com/containerd/containerd/issues/10905
func TestLoadConfigWithDefaultConfigVersion(t *testing.T) {
data1 := `
Expand Down
Loading