github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #403 from Random-Liu/cleanup-config

Browse Source 
Cleanup config.
This commit is contained in:
Lantao Liu 2017-11-07 14:07:20 -08:00 committed by GitHub
commit 472f74e952
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/cri-containerd/options/options.go
View File

@ -58,9 +58,9 @@ type ContainerdConfig struct {
// CniConfig contains config related to cni
type CniConfig struct {
// NetworkPluginBinDir is the directory in which the binaries for the plugin is kept.
NetworkPluginBinDir string `toml:"bin_dir" json:"networkPluginBinDir,omitempty"`
NetworkPluginBinDir string `toml:"bin_dir" json:"binDir,omitempty"`
// NetworkPluginConfDir is the directory in which the admin places a CNI conf.
NetworkPluginConfDir string `toml:"conf_dir" json:"networkPluginConfDir,omitempty"`
NetworkPluginConfDir string `toml:"conf_dir" json:"confDir,omitempty"`
}
// Config contains cri-containerd toml config
@ -68,7 +68,7 @@ type Config struct {
// ContainerdConfig contains config related to containerd
ContainerdConfig `toml:"containerd" json:"containerd,omitempty"`
// CniConfig contains config related to cni
CniConfig `toml:"cni" json:"cniConfig,omitempty"`
CniConfig `toml:"cni" json:"cni,omitempty"`
// SocketPath is the path to the socket which cri-containerd serves on.
SocketPath string `toml:"socket_path" json:"socketPath,omitempty"`
// RootDir is the root directory path for managing cri-containerd files