Fix agent tunnel address on rke2

Fix issue where rke2 tunnel was trying to connect to apiserver port instead of supervisor Signed-off-by: Brad Davidson <[email protected]> (cherry picked from commit 5a5b136) Signed-off-by: Brad Davidson <[email protected]>
k3s-io · Dec 10, 2024 · ad873ec · ad873ec
1 parent 42b4da8
commit ad873ec
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/pkg/agent/tunnel/tunnel.go b/pkg/agent/tunnel/tunnel.go
@@ -505,13 +505,14 @@ func (a *agentTunnel) getProxySyncer(ctx context.Context, wg *sync.WaitGroup, tl
 			return
 		}
 
-		newAddresses := sets.New(addresses...)
+		// Compare list of supervisor addresses before and after syncing apiserver
+		// endpoints into the proxy to figure out which supervisors we need to connect to
+		// or disconnect from. Note that the addresses we were passed will not match
+		// the supervisor addresses if the supervisor and apiserver are on different ports -
+		// they must be round-tripped through proxy.Update before comparing.
 		curAddresses := sets.New(proxy.SupervisorAddresses()...)
-		if newAddresses.Equal(curAddresses) {
-			return
-		}
-
 		proxy.Update(addresses)
+		newAddresses := sets.New(proxy.SupervisorAddresses()...)
 
 		// add new servers
 		for address := range newAddresses.Difference(curAddresses) {