InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/dockerd: createAndStartCluster: change to accept Config

Browse Source 
This function took the whole daemon CLI as argument, but only needed
the config; change the signature to accept that.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2025-02-19 17:30:55 +01:00
parent 29aa7e15bd
commit b95fdcd084
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/dockerd/daemon.go
View File

@@ -281,7 +281,7 @@ func (cli *daemonCLI) start(ctx context.Context) (err error) {
return errors.Wrap(err, "failed to start metrics server")
}
c, err := createAndStartCluster(cli, d)
c, err := createAndStartCluster(d, cli.Config)
if err != nil {
log.G(ctx).WithError(err).Fatalf("Error starting cluster component")
}
@@ -928,20 +928,20 @@ func loadListeners(cfg *config.Config, tlsConfig *tls.Config) ([]net.Listener, [
return lss, hosts, nil
}
func createAndStartCluster(cli *daemonCLI, d *daemon.Daemon) (*cluster.Cluster, error) {
func createAndStartCluster(d *daemon.Daemon, cfg *config.Config) (*cluster.Cluster, error) {
name, _ := os.Hostname()
c, err := cluster.New(cluster.Config{
Root: cli.Config.Root,
Root: cfg.Root,
Name: name,
Backend: d,
VolumeBackend: d.VolumesService(),
ImageBackend: d.ImageBackend(),
PluginBackend: d.PluginManager(),
NetworkSubnetsProvider: d,
DefaultAdvertiseAddr: cli.Config.SwarmDefaultAdvertiseAddr,
RaftHeartbeatTick: cli.Config.SwarmRaftHeartbeatTick,
RaftElectionTick: cli.Config.SwarmRaftElectionTick,
RuntimeRoot: getSwarmRunRoot(cli.Config),
DefaultAdvertiseAddr: cfg.SwarmDefaultAdvertiseAddr,
RaftHeartbeatTick: cfg.SwarmRaftHeartbeatTick,
RaftElectionTick: cfg.SwarmRaftElectionTick,
RuntimeRoot: getSwarmRunRoot(cfg),
})
if err != nil {
return nil, err