Add a separate CLI for cri-containerd ctrcri.

Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu
2018-02-02 02:41:51 +00:00
parent c298d913b7
commit 1f1e03e001
7 changed files with 107 additions and 27 deletions

View File

@@ -19,7 +19,6 @@ package options
import (
"fmt"
"os"
"time"
"github.com/BurntSushi/toml"
"github.com/containerd/containerd"
@@ -31,8 +30,6 @@ const (
configFilePathArgName = "config"
// defaultConfigFilePath is the default config file path.
defaultConfigFilePath = "/etc/cri-containerd/config.toml"
// connectionTimeout is the grpc connection timeout.
connectionTimeout = 10 * time.Second
)
// ContainerdConfig contains toml config related to containerd
@@ -234,13 +231,6 @@ func PrintDefaultTomlConfig() {
}
}
// AddGRPCFlags add flags for grpc connection.
func AddGRPCFlags(fs *pflag.FlagSet) (*string, *time.Duration) {
endpoint := fs.String("endpoint", DefaultConfig().SocketPath, "cri-containerd endpoint.")
timeout := fs.Duration("timeout", connectionTimeout, "cri-containerd connection timeout.")
return endpoint, timeout
}
// DefaultConfig returns default configurations of cri-containerd.
func DefaultConfig() Config {
return Config{