Invoke cluster reset function when only reset flag is passed (k3s-io#…

…3276) Signed-off-by: galal-hussein <[email protected]> Signed-off-by: Brian Downs <[email protected]>
briandowns · May 19, 2021 · 599ab0a · 599ab0a
1 parent a46a2c3
commit 599ab0a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/pkg/agent/run.go b/pkg/agent/run.go
@@ -372,6 +372,11 @@ func setupTunnelAndRunAgent(ctx context.Context, nodeConfig *daemonconfig.Node,
 		case <-ctx.Done():
 			return ctx.Err()
 		}
+	} else if cfg.ClusterReset && proxy.IsAPIServerLBEnabled() {
+		if err := agent.Agent(&nodeConfig.AgentConfig); err != nil {
+			return err
+		}
+		agentRan = true
 	}
 
 	if err := tunnel.Setup(ctx, nodeConfig, proxy); err != nil {

diff --git a/pkg/cli/cmds/agent.go b/pkg/cli/cmds/agent.go
@@ -37,11 +37,7 @@ type Agent struct {
 	EnableSELinux            bool
 	ProtectKernelDefaults    bool
 	AgentShared
-	ExtraKubeletArgs   cli.StringSlice
-	ExtraKubeProxyArgs cli.StringSlice
-	Labels             cli.StringSlice
-	Taints             cli.StringSlice
-	PrivateRegistry    string
+	ClusterReset bool
 }
 
 type AgentShared struct {

diff --git a/pkg/cli/server/server.go b/pkg/cli/server/server.go
@@ -333,6 +333,7 @@ func run(app *cli.Context, cfg *cmds.Server, leaderControllers server.CustomCont
 	agentConfig.Token = token
 	agentConfig.DisableLoadBalancer = !serverConfig.ControlConfig.DisableAPIServer
 	agentConfig.ETCDAgent = serverConfig.ControlConfig.DisableAPIServer
+	agentConfig.ClusterReset = serverConfig.ControlConfig.ClusterReset
 
 	agentConfig.Rootless = cfg.Rootless
 

diff --git a/pkg/cluster/managed.go b/pkg/cluster/managed.go
@@ -69,9 +69,12 @@ func (c *Cluster) start(ctx context.Context) error {
 			if !os.IsNotExist(err) {
 				return err
 			}
-		} else {
-			return fmt.Errorf("cluster-reset was successfully performed, please remove the cluster-reset flag and start %s normally, if you need to perform another cluster reset, you must first manually delete the %s file", version.Program, resetFile)
+			rebootstrap := func() error {
+				return c.storageBootstrap(ctx)
+			}
+			return c.managedDB.Reset(ctx, rebootstrap)
 		}
+		return fmt.Errorf("cluster-reset was successfully performed, please remove the cluster-reset flag and start %s normally, if you need to perform another cluster reset, you must first manually delete the %s file", version.Program, resetFile)
 	}
 
 	// removing the reset file and ignore error if the file doesn't exist