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

Fix agent supervisor port using apiserver port instead 

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
pull/10378/head v1.27.15-rc2+k3s1
Brad Davidson 2024-06-13 20:27:33 +00:00 committed by Brad Davidson
parent 102e42a55d
commit cb36c910a6
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/agent/config/config.go
View File

@ -546,6 +546,7 @@ func get(ctx context.Context, envInfo *cmds.Agent, proxy proxy.Proxy) (*config.N
FlannelExternalIP: controlConfig.FlannelExternalIP, FlannelExternalIP: controlConfig.FlannelExternalIP,
EgressSelectorMode: controlConfig.EgressSelectorMode, EgressSelectorMode: controlConfig.EgressSelectorMode,
ServerHTTPSPort: controlConfig.HTTPSPort, ServerHTTPSPort: controlConfig.HTTPSPort,
SupervisorPort: controlConfig.SupervisorPort,
SupervisorMetrics: controlConfig.SupervisorMetrics, SupervisorMetrics: controlConfig.SupervisorMetrics,
Token: info.String(), Token: info.String(),
} }

2
pkg/agent/https/https.go
View File

@ -36,7 +36,7 @@ func Start(ctx context.Context, nodeConfig *config.Node, runtime *config.Control
if runtime == nil { if runtime == nil {
// If we do not have an existing handler, set up a new listener // 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 { if lerr != nil {
err = lerr err = lerr
return return

1
pkg/daemons/config/types.go
View File

@ -60,6 +60,7 @@ type Node struct {
Token string Token string
Certificate *tls.Certificate Certificate *tls.Certificate
ServerHTTPSPort int ServerHTTPSPort int
SupervisorPort int
DefaultRuntime string DefaultRuntime string
} }