diff --git a/pkg/cluster/bootstrap.go b/pkg/cluster/bootstrap.go index a0f8045649..4b8edbb3bf 100644 --- a/pkg/cluster/bootstrap.go +++ b/pkg/cluster/bootstrap.go @@ -31,7 +31,7 @@ import ( // Bootstrap attempts to load a managed database driver, if one has been initialized or should be created/joined. // It then checks to see if the cluster needs to load bootstrap data, and if so, loads data into the // ControlRuntimeBoostrap struct, either via HTTP or from the datastore. -func (c *Cluster) Bootstrap(ctx context.Context, snapshot bool) error { +func (c *Cluster) Bootstrap(ctx context.Context, clusterReset bool) error { if err := c.assignManagedDriver(ctx); err != nil { return err } @@ -43,7 +43,7 @@ func (c *Cluster) Bootstrap(ctx context.Context, snapshot bool) error { c.shouldBootstrap = shouldBootstrap if c.managedDB != nil { - if !snapshot { + if !clusterReset { isHTTP := c.config.JoinURL != "" && c.config.Token != "" // For secondary servers, we attempt to connect and reconcile with the datastore. // If that fails we fallback to the local etcd cluster start diff --git a/pkg/daemons/control/server.go b/pkg/daemons/control/server.go index ff76de3e8c..abd7a37ddc 100644 --- a/pkg/daemons/control/server.go +++ b/pkg/daemons/control/server.go @@ -262,7 +262,7 @@ func prepare(ctx context.Context, config *config.Control) error { cluster := cluster.New(config) - if err := cluster.Bootstrap(ctx, false); err != nil { + if err := cluster.Bootstrap(ctx, config.ClusterReset); err != nil { return err }