Fix agent supervisor port using apiserver port instead

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
k3s-io · Jun 13, 2024 · b4d4ed8 · b4d4ed8
1 parent 9af17d2
commit b4d4ed8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/pkg/agent/config/config.go b/pkg/agent/config/config.go
@@ -545,6 +545,7 @@ func get(ctx context.Context, envInfo *cmds.Agent, proxy proxy.Proxy) (*config.N
 		FlannelExternalIP:        controlConfig.FlannelExternalIP,
 		EgressSelectorMode:       controlConfig.EgressSelectorMode,
 		ServerHTTPSPort:          controlConfig.HTTPSPort,
+		SupervisorPort:           controlConfig.SupervisorPort,
 		SupervisorMetrics:        controlConfig.SupervisorMetrics,
 		Token:                    info.String(),
 	}

diff --git a/pkg/agent/https/https.go b/pkg/agent/https/https.go
@@ -36,7 +36,7 @@ func Start(ctx context.Context, nodeConfig *config.Node, runtime *config.Control
 
 		if runtime == nil {
 			// If we do not have an existing handler, set up a new listener
-			tcp, lerr := util.ListenWithLoopback(ctx, nodeConfig.AgentConfig.ListenAddress, strconv.Itoa(nodeConfig.ServerHTTPSPort))
+			tcp, lerr := util.ListenWithLoopback(ctx, nodeConfig.AgentConfig.ListenAddress, strconv.Itoa(nodeConfig.SupervisorPort))
 			if lerr != nil {
 				err = lerr
 				return

diff --git a/pkg/daemons/config/types.go b/pkg/daemons/config/types.go
@@ -58,6 +58,7 @@ type Node struct {
 	Token                    string
 	Certificate              *tls.Certificate
 	ServerHTTPSPort          int
+	SupervisorPort           int
 	DefaultRuntime           string
 }