From b95fdcd084d51deae14abb9540f4bb9a2680959b Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 19 Feb 2025 17:30:55 +0100 Subject: [PATCH] cmd/dockerd: createAndStartCluster: change to accept Config 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 --- cmd/dockerd/daemon.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/dockerd/daemon.go b/cmd/dockerd/daemon.go index b04d47fc81..5eb6e0070e 100644 --- a/cmd/dockerd/daemon.go +++ b/cmd/dockerd/daemon.go @@ -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