github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Skip initial datastore reconcile during cluster-reset 

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
pull/8882/head
Brad Davidson 2023-11-15 00:31:15 +00:00 committed by Brad Davidson
parent 2088218c5f
commit 7ecd5874d2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cluster/bootstrap.go
View File

@ -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

2
pkg/daemons/control/server.go
View File

@ -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
}