Skip to content

Commit f1f8cb0

Browse files
crosbymichaelcrosbymichael
authored
Merge pull request #2725 from fuweid/enhance_split_config_from_server
enhance: split config from server package
2 parents 483724b + 06616da commit f1f8cb0

13 files changed

+46
-31
lines changed

‎cmd/containerd/command/config.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,13 @@ import (
2323

2424
"github.com/BurntSushi/toml"
2525
"github.com/containerd/containerd/services/server"
26+
srvconfig "github.com/containerd/containerd/services/server/config"
2627
"github.com/urfave/cli"
2728
)
2829

2930
// Config is a wrapper of server config for printing out.
3031
type Config struct {
31-
*server.Config
32+
*srvconfig.Config
3233
// Plugins overrides `Plugins map[string]toml.Primitive` in server config.
3334
Plugins map[string]interface{} `toml:"plugins"`
3435
}

‎cmd/containerd/command/config_linux.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ package command
1818

1919
import (
2020
"github.com/containerd/containerd/defaults"
21-
"github.com/containerd/containerd/services/server"
21+
srvconfig "github.com/containerd/containerd/services/server/config"
2222
)
2323

24-
func defaultConfig() *server.Config {
25-
return &server.Config{
24+
func defaultConfig() *srvconfig.Config {
25+
return &srvconfig.Config{
2626
Root: defaults.DefaultRootDir,
2727
State: defaults.DefaultStateDir,
28-
GRPC: server.GRPCConfig{
28+
GRPC: srvconfig.GRPCConfig{
2929
Address: defaults.DefaultAddress,
3030
MaxRecvMsgSize: defaults.DefaultMaxRecvMsgSize,
3131
MaxSendMsgSize: defaults.DefaultMaxSendMsgSize,

‎cmd/containerd/command/config_unsupported.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ package command
2020

2121
import (
2222
"github.com/containerd/containerd/defaults"
23-
"github.com/containerd/containerd/services/server"
23+
srvconfig "github.com/containerd/containerd/services/server/config"
2424
)
2525

26-
func defaultConfig() *server.Config {
27-
return &server.Config{
26+
func defaultConfig() *srvconfig.Config {
27+
return &srvconfig.Config{
2828
Root: defaults.DefaultRootDir,
2929
State: defaults.DefaultStateDir,
30-
GRPC: server.GRPCConfig{
30+
GRPC: srvconfig.GRPCConfig{
3131
Address: defaults.DefaultAddress,
3232
},
33-
Debug: server.Debug{
33+
Debug: srvconfig.Debug{
3434
Level: "info",
3535
Address: defaults.DefaultDebugAddress,
3636
},

‎cmd/containerd/command/config_windows.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ package command
1818

1919
import (
2020
"github.com/containerd/containerd/defaults"
21-
"github.com/containerd/containerd/services/server"
21+
srvconfig "github.com/containerd/containerd/services/server/config"
2222
)
2323

24-
func defaultConfig() *server.Config {
25-
return &server.Config{
24+
func defaultConfig() *srvconfig.Config {
25+
return &srvconfig.Config{
2626
Root: defaults.DefaultRootDir,
2727
State: defaults.DefaultStateDir,
28-
GRPC: server.GRPCConfig{
28+
GRPC: srvconfig.GRPCConfig{
2929
Address: defaults.DefaultAddress,
3030
MaxRecvMsgSize: defaults.DefaultMaxRecvMsgSize,
3131
MaxSendMsgSize: defaults.DefaultMaxSendMsgSize,

‎cmd/containerd/command/main.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import (
2929
"github.com/containerd/containerd/log"
3030
"github.com/containerd/containerd/mount"
3131
"github.com/containerd/containerd/services/server"
32+
srvconfig "github.com/containerd/containerd/services/server/config"
3233
"github.com/containerd/containerd/sys"
3334
"github.com/containerd/containerd/version"
3435
"github.com/pkg/errors"
@@ -109,7 +110,7 @@ func App() *cli.App {
109110
// we don't miss any signals during boot
110111
signal.Notify(signals, handledSignals...)
111112

112-
if err := server.LoadConfig(context.GlobalString("config"), config); err != nil && !os.IsNotExist(err) {
113+
if err := srvconfig.LoadConfig(context.GlobalString("config"), config); err != nil && !os.IsNotExist(err) {
113114
return err
114115
}
115116
// apply flags to the config
@@ -187,7 +188,7 @@ func serve(ctx gocontext.Context, l net.Listener, serveFunc func(net.Listener) e
187188
}()
188189
}
189190

190-
func applyFlags(context *cli.Context, config *server.Config) error {
191+
func applyFlags(context *cli.Context, config *srvconfig.Config) error {
191192
// the order for config vs flag values is that flags will always override
192193
// the config values if they are set
193194
if err := setLevel(context, config); err != nil {
@@ -217,7 +218,7 @@ func applyFlags(context *cli.Context, config *server.Config) error {
217218
return nil
218219
}
219220

220-
func setLevel(context *cli.Context, config *server.Config) error {
221+
func setLevel(context *cli.Context, config *srvconfig.Config) error {
221222
l := context.GlobalString("log-level")
222223
if l == "" {
223224
l = config.Debug.Level

‎daemon_config_linux_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"github.com/containerd/containerd/oci"
3131
"github.com/containerd/containerd/pkg/testutil"
3232
"github.com/containerd/containerd/runtime/v2/runc/options"
33-
"github.com/containerd/containerd/services/server"
33+
srvconfig "github.com/containerd/containerd/services/server/config"
3434
)
3535

3636
// the following nolint is for shutting up gometalinter on non-linux.
@@ -42,7 +42,7 @@ func newDaemonWithConfig(t *testing.T, configTOML string) (*Client, *daemon, fun
4242
testutil.RequiresRoot(t)
4343
var (
4444
ctrd = daemon{}
45-
configTOMLDecoded server.Config
45+
configTOMLDecoded srvconfig.Config
4646
buf = bytes.NewBuffer(nil)
4747
)
4848

@@ -61,7 +61,7 @@ func newDaemonWithConfig(t *testing.T, configTOML string) (*Client, *daemon, fun
6161
t.Fatal(err)
6262
}
6363

64-
if err = server.LoadConfig(configTOMLFile, &configTOMLDecoded); err != nil {
64+
if err = srvconfig.LoadConfig(configTOMLFile, &configTOMLDecoded); err != nil {
6565
t.Fatal(err)
6666
}
6767

‎services/server/config.go ‎services/server/config/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
limitations under the License.
1515
*/
1616

17-
package server
17+
package config
1818

1919
import (
2020
"github.com/BurntSushi/toml"

‎services/server/server.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ import (
4040
"github.com/containerd/containerd/metadata"
4141
"github.com/containerd/containerd/pkg/dialer"
4242
"github.com/containerd/containerd/plugin"
43+
srvconfig "github.com/containerd/containerd/services/server/config"
4344
"github.com/containerd/containerd/snapshots"
4445
ssproxy "github.com/containerd/containerd/snapshots/proxy"
4546
metrics "github.com/docker/go-metrics"
@@ -50,7 +51,7 @@ import (
5051
)
5152

5253
// New creates and initializes a new containerd server
53-
func New(ctx context.Context, config *Config) (*Server, error) {
54+
func New(ctx context.Context, config *srvconfig.Config) (*Server, error) {
5455
switch {
5556
case config.Root == "":
5657
return nil, errors.New("root must be specified")
@@ -149,7 +150,7 @@ func New(ctx context.Context, config *Config) (*Server, error) {
149150
type Server struct {
150151
rpc *grpc.Server
151152
events *exchange.Exchange
152-
config *Config
153+
config *srvconfig.Config
153154
plugins []*plugin.Plugin
154155
}
155156

@@ -211,7 +212,7 @@ func (s *Server) Stop() {
211212

212213
// LoadPlugins loads all plugins into containerd and generates an ordered graph
213214
// of all plugins.
214-
func LoadPlugins(ctx context.Context, config *Config) ([]*plugin.Registration, error) {
215+
func LoadPlugins(ctx context.Context, config *srvconfig.Config) ([]*plugin.Registration, error) {
215216
// load all plugins into containerd
216217
if err := plugin.Load(filepath.Join(config.Root, "plugins")); err != nil {
217218
return nil, err

‎services/server/server_linux.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@ import (
2222

2323
"github.com/containerd/cgroups"
2424
"github.com/containerd/containerd/log"
25+
srvconfig "github.com/containerd/containerd/services/server/config"
2526
"github.com/containerd/containerd/sys"
2627
specs "github.com/opencontainers/runtime-spec/specs-go"
2728
)
2829

2930
// apply sets config settings on the server process
30-
func apply(ctx context.Context, config *Config) error {
31+
func apply(ctx context.Context, config *srvconfig.Config) error {
3132
if config.OOMScore != 0 {
3233
log.G(ctx).Debugf("changing OOM score to %d", config.OOMScore)
3334
if err := sys.SetOOMScore(os.Getpid(), config.OOMScore); err != nil {

‎services/server/server_solaris.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,12 @@
1616

1717
package server
1818

19-
import "context"
19+
import (
20+
"context"
2021

21-
func apply(_ context.Context, _ *Config) error {
22+
srvconfig "github.com/containerd/containerd/server/config"
23+
)
24+
25+
func apply(_ context.Context, _ *srvconfig.Config) error {
2226
return nil
2327
}

‎services/server/server_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,14 @@ import (
2020
"context"
2121
"testing"
2222

23+
srvconfig "github.com/containerd/containerd/services/server/config"
2324
"gotest.tools/assert"
2425
is "gotest.tools/assert/cmp"
2526
)
2627

2728
func TestNewErrorsWithSamePathForRootAndState(t *testing.T) {
2829
path := "/tmp/path/for/testing"
29-
_, err := New(context.Background(), &Config{
30+
_, err := New(context.Background(), &srvconfig.Config{
3031
Root: path,
3132
State: path,
3233
})

‎services/server/server_unsupported.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,12 @@
1818

1919
package server
2020

21-
import "context"
21+
import (
22+
"context"
2223

23-
func apply(_ context.Context, _ *Config) error {
24+
srvconfig "github.com/containerd/containerd/services/server/config"
25+
)
26+
27+
func apply(_ context.Context, _ *srvconfig.Config) error {
2428
return nil
2529
}

‎services/server/server_windows.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ package server
2020

2121
import (
2222
"context"
23+
24+
srvconfig "github.com/containerd/containerd/services/server/config"
2325
)
2426

25-
func apply(_ context.Context, _ *Config) error {
27+
func apply(_ context.Context, _ *srvconfig.Config) error {
2628
return nil
2729
}

0 commit comments

Comments
 (0)