Remove standalone mode

Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu
2018-03-05 19:13:29 +00:00
parent 64b098a293
commit d1e9960180
8 changed files with 173 additions and 659 deletions

View File

@@ -20,10 +20,10 @@ import (
"os"
"time"
"github.com/containerd/containerd/defaults"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
"github.com/containerd/cri-containerd/cmd/cri-containerd/options"
"github.com/containerd/cri-containerd/pkg/version"
)
@@ -56,9 +56,7 @@ var (
)
func addGlobalFlags(fs *pflag.FlagSet) {
// TODO(random-liu): Change default to containerd/defaults.DefaultAddress after cri plugin
// become default.
fs.StringVar(&address, "address", options.DefaultConfig().SocketPath, "address for containerd's GRPC server.")
fs.StringVar(&address, "address", defaults.DefaultAddress, "address for containerd's GRPC server.")
fs.DurationVar(&timeout, "timeout", defaultTimeout, "timeout for containerd grpc connection.")
}