From 9a7ca39cbd7c6b7598c067835693375a4ccb4a5b Mon Sep 17 00:00:00 2001
From: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Date: Mon, 8 Mar 2021 17:37:58 +0900
Subject: [PATCH] defaults: add DefaultConfigDir

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
---
 cmd/containerd/command/main.go         | 3 ++-
 cmd/containerd/command/main_unix.go    | 2 --
 cmd/containerd/command/main_windows.go | 4 +---
 defaults/defaults_unix.go              | 2 ++
 defaults/defaults_windows.go           | 3 +++
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/cmd/containerd/command/main.go b/cmd/containerd/command/main.go
index 297f89403..eb12bb4ba 100644
--- 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
index bdfddc70d..b8970c6d2 100644
--- 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
index 7e3430bb6..774a49618 100644
--- 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
index 319e8777b..6b69cd06b 100644
--- 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
index 5eede8de8..a80700075 100644
--- 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 (