From 3bbbac4bb9d6eba00fd22ceba0bef0cb150cf6d4 Mon Sep 17 00:00:00 2001
From: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Date: Wed, 28 May 2025 15:09:13 -0600
Subject: [PATCH] fix(hydrator): increase max msg size (#23190)

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
---
 commitserver/apiclient/clientset.go | 7 +++++++
 commitserver/server.go              | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/commitserver/apiclient/clientset.go b/commitserver/apiclient/clientset.go
index 0726c86434..a89efc3eb8 100644
--- a/commitserver/apiclient/clientset.go
+++ b/commitserver/apiclient/clientset.go
@@ -2,6 +2,10 @@ package apiclient
 
 import (
 	"fmt"
+	"math"
+
+	"github.com/argoproj/argo-cd/v3/common"
+	"github.com/argoproj/argo-cd/v3/util/env"
 
 	log "github.com/sirupsen/logrus"
 	"google.golang.org/grpc"
@@ -10,6 +14,9 @@ import (
 	utilio "github.com/argoproj/argo-cd/v3/util/io"
 )
 
+// MaxGRPCMessageSize contains max grpc message size
+var MaxGRPCMessageSize = env.ParseNumFromEnv(common.EnvGRPCMaxSizeMB, 100, 0, math.MaxInt32) * 1024 * 1024
+
 // Clientset represents commit server api clients
 type Clientset interface {
 	NewCommitServerClient() (utilio.Closer, CommitServiceClient, error)
diff --git a/commitserver/server.go b/commitserver/server.go
index 3404267cae..28607f263f 100644
--- a/commitserver/server.go
+++ b/commitserver/server.go
@@ -25,7 +25,7 @@ func NewServer(gitCredsStore git.CredsStore, metricsServer *metrics.Server) *Arg
 
 // CreateGRPC creates a new gRPC server.
 func (a *ArgoCDCommitServer) CreateGRPC() *grpc.Server {
-	server := grpc.NewServer()
+	server := grpc.NewServer(grpc.MaxRecvMsgSize(apiclient.MaxGRPCMessageSize))
 	versionpkg.RegisterVersionServiceServer(server, version.NewServer(nil, func() (bool, error) {
 		return true, nil
 	}))