From 1dca0ab404233df489c204937640ea2ef4db3c90 Mon Sep 17 00:00:00 2001
From: Pascal Fischer <pascal@netbird.io>
Date: Fri, 14 Mar 2025 10:25:53 +0100
Subject: [PATCH] increase grpc timeouts

---
 management/client/grpc.go | 10 ++++------
 util/grpc/dialer.go       |  9 +++------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/management/client/grpc.go b/management/client/grpc.go
index 8ed130ffe..2b1daff36 100644
--- a/management/client/grpc.go
+++ b/management/client/grpc.go
@@ -272,9 +272,9 @@ func (c *GrpcClient) GetServerPublicKey() (*wgtypes.Key, error) {
 		return nil, errors.New(errMsgNoMgmtConnection)
 	}
 
-	mgmCtx, cancel := context.WithTimeout(c.ctx, 30*time.Second)
-	defer cancel()
-	resp, err := c.realClient.GetServerKey(mgmCtx, &proto.Empty{})
+	// mgmCtx, cancel := context.WithTimeout(c.ctx, 30*time.Second)
+	// defer cancel()
+	resp, err := c.realClient.GetServerKey(c.ctx, &proto.Empty{})
 	if err != nil {
 		log.Errorf("failed while getting Management Service public key: %v", err)
 		return nil, fmt.Errorf("failed while getting Management Service public key")
@@ -327,11 +327,9 @@ func (c *GrpcClient) login(serverKey wgtypes.Key, req *proto.LoginRequest) (*pro
 
 	var resp *proto.EncryptedMessage
 	operation := func() error {
-		mgmCtx, cancel := context.WithTimeout(context.Background(), ConnectTimeout)
-		defer cancel()
 
 		var err error
-		resp, err = c.realClient.Login(mgmCtx, &proto.EncryptedMessage{
+		resp, err = c.realClient.Login(context.Background(), &proto.EncryptedMessage{
 			WgPubKey: c.key.PublicKey().String(),
 			Body:     loginReq,
 		})
diff --git a/util/grpc/dialer.go b/util/grpc/dialer.go
index f6d6d2f04..6b8ed7a60 100644
--- a/util/grpc/dialer.go
+++ b/util/grpc/dialer.go
@@ -71,18 +71,15 @@ func CreateConnection(addr string, tlsEnabled bool) (*grpc.ClientConn, error) {
 		}))
 	}
 
-	connCtx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-	defer cancel()
-
 	conn, err := grpc.DialContext(
-		connCtx,
+		context.Background(),
 		addr,
 		transportOption,
 		WithCustomDialer(),
 		grpc.WithBlock(),
 		grpc.WithKeepaliveParams(keepalive.ClientParameters{
-			Time:    30 * time.Second,
-			Timeout: 10 * time.Second,
+			Time:    10 * time.Minute,
+			Timeout: 5 * time.Minute,
 		}),
 	)
 	if err != nil {