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

Merge pull request #294 from Random-Liu/cleanup-flags

Browse Source 
Cleanup flag default value
This commit is contained in:
Lantao Liu 2017-09-28 13:13:14 -07:00 committed by GitHub
commit f586073b1c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,9 +118,9 @@ func (c *CRIContainerdOptions) AddFlags(fs *pflag.FlagSet) {
fs.StringVar(&c.ContainerdConfig.Runtime, "containerd-runtime", fs.StringVar(&c.ContainerdConfig.Runtime, "containerd-runtime",
"io.containerd.runtime.v1.linux", "The runtime used by containerd.") "io.containerd.runtime.v1.linux", "The runtime used by containerd.")
fs.StringVar(&c.ContainerdConfig.RuntimeEngine, "containerd-runtime-engine", fs.StringVar(&c.ContainerdConfig.RuntimeEngine, "containerd-runtime-engine",
"", "Runtime engine used by containerd. (default = \"\" uses containerd default)") "", "Runtime engine used by containerd. Defaults to containerd's default if not specified.")
fs.StringVar(&c.ContainerdConfig.RuntimeRoot, "containerd-runtime-root", fs.StringVar(&c.ContainerdConfig.RuntimeRoot, "containerd-runtime-root",
"", "The directory used by containerd for runtime state. (default = \"\" uses containerd default)") "", "The directory used by containerd for runtime state. Defaults to containerd's default if not specified.")
fs.BoolVar(&c.PrintVersion, "version", fs.BoolVar(&c.PrintVersion, "version",
false, "Print cri-containerd version information and quit.") false, "Print cri-containerd version information and quit.")
fs.StringVar(&c.NetworkPluginBinDir, "network-bin-dir", fs.StringVar(&c.NetworkPluginBinDir, "network-bin-dir",
@ -128,19 +128,19 @@ func (c *CRIContainerdOptions) AddFlags(fs *pflag.FlagSet) {
fs.StringVar(&c.NetworkPluginConfDir, "network-conf-dir", fs.StringVar(&c.NetworkPluginConfDir, "network-conf-dir",
"/etc/cni/net.d", "The directory for putting network plugin configuration files.") "/etc/cni/net.d", "The directory for putting network plugin configuration files.")
fs.StringVar(&c.StreamServerAddress, "stream-addr", fs.StringVar(&c.StreamServerAddress, "stream-addr",
"", "The ip address streaming server is listening on. Default host interface is used if this is empty.") "", "The ip address streaming server is listening on. The default host interface is used if not specified.")
fs.StringVar(&c.StreamServerPort, "stream-port", fs.StringVar(&c.StreamServerPort, "stream-port",
"10010", "The port streaming server is listening on.") "10010", "The port streaming server is listening on.")
fs.StringVar(&c.CgroupPath, "cgroup-path", fs.StringVar(&c.CgroupPath, "cgroup-path",
"", "The cgroup that cri-containerd is part of. By default cri-containerd is not placed in a cgroup.") "", "The cgroup that cri-containerd is part of. Cri-containerd is not placed in a cgroup if none is specified.")
fs.BoolVar(&c.EnableSelinux, "enable-selinux", fs.BoolVar(&c.EnableSelinux, "enable-selinux",
false, "Enable selinux support. (default false)") false, "Enable selinux support. By default not enabled.")
fs.StringVar(&c.SandboxImage, "sandbox-image", fs.StringVar(&c.SandboxImage, "sandbox-image",
"gcr.io/google_containers/pause:3.0", "The image used by sandbox container.") "gcr.io/google_containers/pause:3.0", "The image used by sandbox container.")
fs.IntVar(&c.StatsCollectPeriod, "stats-collect-period", fs.IntVar(&c.StatsCollectPeriod, "stats-collect-period",
10, "The period (in seconds) of snapshots stats collection.") 10, "The period (in seconds) of snapshots stats collection.")
fs.BoolVar(&c.SystemdCgroup, "systemd-cgroup", fs.BoolVar(&c.SystemdCgroup, "systemd-cgroup",
false, "Enables systemd cgroup support. (default false)") false, "Enables systemd cgroup support. By default not enabled.")
fs.BoolVar(&c.PrintDefaultConfig, "default-config", fs.BoolVar(&c.PrintDefaultConfig, "default-config",
false, "Print default toml config of cri-containerd and quit.") false, "Print default toml config of cri-containerd and quit.")
} }