defaults: add DefaultConfigDir

AkihiroSuda · AkihiroSuda · commit 9a7ca39cbd7c · 2021-03-15T13:27:15.000+09:00
Signed-off-by: Akihiro Suda &lt;akihiro.suda.cz@hco.ntt.co.jp&gt;
diff --git a/cmd/containerd/command/main.go b/cmd/containerd/command/main.go
@@ -27,6 +27,7 @@ import (
 	"runtime"
 	"time"
 
+	"github.com/containerd/containerd/defaults"
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/mount"
@@ -80,7 +81,7 @@ can be used and modified as necessary as a custom configuration.`
 		cli.StringFlag{
 			Name:  "config,c",
 			Usage: "path to the configuration file",
-			Value: defaultConfigPath,
+			Value: filepath.Join(defaults.DefaultConfigDir, "config.toml"),
 		},
 		cli.StringFlag{
 			Name:  "log-level,l",
diff --git a/cmd/containerd/command/main_unix.go b/cmd/containerd/command/main_unix.go
@@ -27,8 +27,6 @@ import (
 	"golang.org/x/sys/unix"
 )
 
-const defaultConfigPath = "/etc/containerd/config.toml"
-
 var handledSignals = []os.Signal{
 	unix.SIGTERM,
 	unix.SIGINT,
diff --git a/cmd/containerd/command/main_windows.go b/cmd/containerd/command/main_windows.go
@@ -20,7 +20,6 @@ import (
 	"context"
 	"fmt"
 	"os"
-	"path/filepath"
 	"unsafe"
 
 	"github.com/Microsoft/go-winio/pkg/etw"
@@ -33,8 +32,7 @@ import (
 )
 
 var (
-	defaultConfigPath = filepath.Join(os.Getenv("programfiles"), "containerd", "config.toml")
-	handledSignals    = []os.Signal{
+	handledSignals = []os.Signal{
 		windows.SIGTERM,
 		windows.SIGINT,
 	}
diff --git a/defaults/defaults_unix.go b/defaults/defaults_unix.go
@@ -34,4 +34,6 @@ const (
 	DefaultFIFODir = "/run/containerd/fifo"
 	// DefaultRuntime is the default linux runtime
 	DefaultRuntime = "io.containerd.runc.v2"
+	// DefaultConfigDir is the default location for config files.
+	DefaultConfigDir = "/etc/containerd"
 )
diff --git a/defaults/defaults_windows.go b/defaults/defaults_windows.go
@@ -30,6 +30,9 @@ var (
 	// DefaultStateDir is the default location used by containerd to store
 	// transient data
 	DefaultStateDir = filepath.Join(os.Getenv("ProgramData"), "containerd", "state")
+
+	// DefaultConfigDir is the default location for config files.
+	DefaultConfigDir = filepath.Join(os.Getenv("programfiles"), "containerd")
 )
 
 const (

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,6 @@ import (`
`27`	`27`	`"golang.org/x/sys/unix"`
`28`	`28`	`)`
`29`	`29`
`30`		`-const defaultConfigPath = "/etc/containerd/config.toml"`
`31`		`-`
`32`	`30`	`var handledSignals = []os.Signal{`
`33`	`31`	`unix.SIGTERM,`
`34`	`32`	`unix.SIGINT,`
Original file line number	Diff line number	Diff line change
`@@ -34,4 +34,6 @@ const (`
`34`	`34`	`DefaultFIFODir = "/run/containerd/fifo"`
`35`	`35`	`// DefaultRuntime is the default linux runtime`
`36`	`36`	`DefaultRuntime = "io.containerd.runc.v2"`
	`37`	`+ // DefaultConfigDir is the default location for config files.`
	`38`	`+ DefaultConfigDir = "/etc/containerd"`
`37`	`39`	`)`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,9 @@ var (`
`30`	`30`	`// DefaultStateDir is the default location used by containerd to store`
`31`	`31`	`// transient data`
`32`	`32`	`DefaultStateDir = filepath.Join(os.Getenv("ProgramData"), "containerd", "state")`
	`33`	`+`
	`34`	`+ // DefaultConfigDir is the default location for config files.`
	`35`	`+ DefaultConfigDir = filepath.Join(os.Getenv("programfiles"), "containerd")`
`33`	`36`	`)`
`34`	`37`
`35`	`38`	`const (`