2a7c1cc1d6
Taking the same approach as was taken in containerd
The new library has a slightly different output;
- keys at the same level are sorted alphabetically
- empty sections not omitted (`proxy_plugins`, `stream_processors`, `timeouts`),
which could possibly be be addressed with an "omitempty" in containerd's struct.
- empty slices are not omitted (`imports`, `required_plugins`)
After sorting the "before" configuration the diff looks like this:
```patch
diff --git a/config-before-sorted.toml b/config-after.toml
index cc771ce7ab..43a727f589 100644
--- a/config-before-sorted.toml
+++ b/config-after.toml
@@ -1,6 +1,8 @@
disabled_plugins = ["cri"]
+imports = []
oom_score = 0
plugin_dir = ""
+required_plugins = []
root = "/var/lib/docker/containerd/daemon"
state = "/var/run/docker/containerd/daemon"
version = 0
@@ -37,6 +39,12 @@ version = 0
shim = "containerd-shim"
shim_debug = true
+[proxy_plugins]
+
+[stream_processors]
+
+[timeouts]
+
[ttrpc]
address = ""
gid = 0
```
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
55 lines
1.4 KiB
Go
55 lines
1.4 KiB
Go
package supervisor // import "github.com/docker/docker/libcontainerd/supervisor"
|
|
|
|
// WithRemoteAddr sets the external containerd socket to connect to.
|
|
func WithRemoteAddr(addr string) DaemonOpt {
|
|
return func(r *remote) error {
|
|
r.GRPC.Address = addr
|
|
return nil
|
|
}
|
|
}
|
|
|
|
// WithRemoteAddrUser sets the uid and gid to create the RPC address with
|
|
func WithRemoteAddrUser(uid, gid int) DaemonOpt {
|
|
return func(r *remote) error {
|
|
r.GRPC.UID = uid
|
|
r.GRPC.GID = gid
|
|
return nil
|
|
}
|
|
}
|
|
|
|
// WithLogLevel defines which log level to starts containerd with.
|
|
// This only makes sense if WithStartDaemon() was set to true.
|
|
func WithLogLevel(lvl string) DaemonOpt {
|
|
return func(r *remote) error {
|
|
r.Debug.Level = lvl
|
|
return nil
|
|
}
|
|
}
|
|
|
|
// WithDebugAddress defines at which location the debug GRPC connection
|
|
// should be made
|
|
func WithDebugAddress(addr string) DaemonOpt {
|
|
return func(r *remote) error {
|
|
r.Debug.Address = addr
|
|
return nil
|
|
}
|
|
}
|
|
|
|
// WithMetricsAddress defines at which location the debug GRPC connection
|
|
// should be made
|
|
func WithMetricsAddress(addr string) DaemonOpt {
|
|
return func(r *remote) error {
|
|
r.Metrics.Address = addr
|
|
return nil
|
|
}
|
|
}
|
|
|
|
// WithPlugin allow configuring a containerd plugin
|
|
// configuration values passed needs to be quoted if quotes are needed in
|
|
// the toml format.
|
|
func WithPlugin(name string, conf interface{}) DaemonOpt {
|
|
return func(r *remote) error {
|
|
r.Plugins[name] = conf
|
|
return nil
|
|
}
|
|
}
|