Skip to content
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

Jump to bottom

Allow split configurations by default: import conf/*.toml by default. #10061

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Allow split configurations by default: import conf/*.toml by default. #10061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions cmd/containerd/command/config.go
View file
Open in desktop
Expand Up @@ -166,6 +166,7 @@ func platformAgnosticDefaultConfig() *srvconfig.Config {
},
DisabledPlugins: []string{},
RequiredPlugins: []string{},
Imports: defaults.DefaultImports,
StreamProcessors: streamProcessors(),
}
}
Expand Down
5 changes: 5 additions & 0 deletions defaults/defaults.go
View file
Open in desktop
Expand Up @@ -30,3 +30,8 @@ const (
// default snapshotter
DefaultSnapshotterNSLabel = "containerd.io/defaults/snapshotter"
)

var (
// DefaultImports is the default imports for config files.
DefaultImports = []string{"conf/*.toml"}
)
2 changes: 1 addition & 1 deletion docs/man/containerd-config.toml.5.md
View file
Open in desktop
Expand Up @@ -143,7 +143,7 @@ documentation.
"io.containerd.timeout.shim.shutdown" = "3s"
"io.containerd.timeout.task.state" = "2s" -->

**imports**
**imports** (Default: ["conf/*.toml"])
: Imports is a list of additional configuration files to include.
This allows to split the main configuration file and keep some sections
separately (for example vendors may keep a custom runtime configuration in a
Expand Down