Close agentReady channel only in k3s (#4792)

* Close agentReady channel only in k3s Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com> * codespell check Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

Close agentReady channel only in k3s (#4792)
2e91913f · Hussein Galal · GitHub · 8ad7d141 · 2e91913f
Unverified Commit 2e91913f authored Dec 21, 2021 by Hussein Galal Committed by GitHub Dec 21, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

server.go pkg/cli/server/server.go +7 -1

No files found.
--- a/pkg/cli/server/server.go
+++ b/pkg/cli/server/server.go
@@ -174,7 +174,13 @@ func run(app *cli.Context, cfg *cmds.Server, leaderControllers server.CustomCont
 		serverConfig.ControlConfig.DisableScheduler = true
 		serverConfig.ControlConfig.DisableCCM = true

-		close(agentReady)
+		// only close the agentReady channel in case of k3s restoration, because k3s does not start
+		// the agent until server returns successfully, unlike rke2's agent which starts in parallel
+		// with the server
+		if serverConfig.ControlConfig.SupervisorPort == serverConfig.ControlConfig.HTTPSPort {
+			close(agentReady)
+		}
+
 		dataDir, err := datadir.LocalHome(cfg.DataDir, false)
 		if err != nil {
 			return err