Skip to content

Commit 654d66e

Browse files
Ash-expAsh-exp
committed
feat: updated kubelink grpc client cfg
1 parent 3dac353 commit 654d66e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+17885
-64
lines changed

‎api/helm-app/gRPC/applicationClient.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"context"
2121
"fmt"
2222
"github.com/caarlos0/env"
23+
grpcUtil "github.com/devtron-labs/common-lib/utils/grpc"
2324
"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
2425
"go.opentelemetry.io/otel"
2526
"go.uber.org/zap"
@@ -55,12 +56,16 @@ type HelmAppClientImpl struct {
5556
logger *zap.SugaredLogger
5657
helmClientConfig *HelmClientConfig
5758
applicationServiceClient ApplicationServiceClient
59+
grpcConfig *grpcUtil.Configuration
5860
}
5961

60-
func NewHelmAppClientImpl(logger *zap.SugaredLogger, helmClientConfig *HelmClientConfig) *HelmAppClientImpl {
62+
func NewHelmAppClientImpl(logger *zap.SugaredLogger,
63+
helmClientConfig *HelmClientConfig,
64+
grpcConfig *grpcUtil.Configuration) *HelmAppClientImpl {
6165
return &HelmAppClientImpl{
6266
logger: logger,
6367
helmClientConfig: helmClientConfig,
68+
grpcConfig: grpcConfig,
6469
}
6570
}
6671

@@ -89,12 +94,15 @@ func (impl *HelmAppClientImpl) getConnection() (*grpc.ClientConn, error) {
8994
var opts []grpc.DialOption
9095
ctx, _ := context.WithTimeout(context.Background(), 10*time.Second)
9196
opts = append(opts,
97+
grpc.WithDefaultCallOptions(),
98+
grpc.WithDefaultCallOptions(),
9299
grpc.WithUnaryInterceptor(otelgrpc.UnaryClientInterceptor()),
93100
grpc.WithStreamInterceptor(otelgrpc.StreamClientInterceptor()),
94101
grpc.WithBlock(),
95102
grpc.WithInsecure(),
96103
grpc.WithDefaultCallOptions(
97-
grpc.MaxCallRecvMsgSize(20*1024*1024),
104+
grpc.MaxCallRecvMsgSize(impl.grpcConfig.KubelinkMaxSendMsgSize*1024*1024), // GRPC Request size
105+
grpc.MaxCallSendMsgSize(impl.grpcConfig.KubelinkMaxRecvMsgSize*1024*1024), // GRPC Response size
98106
),
99107
grpc.WithDefaultServiceConfig(`{"loadBalancingPolicy":"round_robin"}`),
100108
)

‎api/helm-app/wire_helmApp.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,15 @@
1717
package client
1818

1919
import (
20+
grpcUtil "github.com/devtron-labs/common-lib/utils/grpc"
2021
"github.com/devtron-labs/devtron/api/helm-app/gRPC"
2122
"github.com/devtron-labs/devtron/api/helm-app/service"
2223
"github.com/devtron-labs/devtron/util/rbac"
2324
"github.com/google/wire"
2425
)
2526

2627
var HelmAppWireSet = wire.NewSet(
28+
grpcUtil.GetConfiguration,
2729
gRPC.NewHelmAppClientImpl,
2830
wire.Bind(new(gRPC.HelmAppClient), new(*gRPC.HelmAppClientImpl)),
2931
service.GetHelmReleaseConfig,

‎cmd/external-app/wire_gen.go

Lines changed: 6 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎env_gen.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,8 @@
169169
| K8s_TCP_KEEPALIVE | 30 | |
170170
| K8s_TCP_TIMEOUT | 30 | |
171171
| K8s_TLS_HANDSHAKE_TIMEOUT | 10 | |
172+
| KUBELINK_GRPC_MAX_RECEIVE_MSG_SIZE | 20 | |
173+
| KUBELINK_GRPC_MAX_SEND_MSG_SIZE | 4 | |
172174
| LENS_TIMEOUT | 0 | |
173175
| LENS_URL | http://lens-milandevtron-service:80 | |
174176
| LIMIT_CI_CPU | 0.5 | |
@@ -245,8 +247,8 @@
245247
| USE_BLOB_STORAGE_CONFIG_IN_CD_WORKFLOW | true | |
246248
| USE_BLOB_STORAGE_CONFIG_IN_CI_WORKFLOW | true | |
247249
| USE_BUILDX | false | |
248-
| USE_CUSTOM_HTTP_TRANSPORT | false | |
249250
| USE_CASBIN_V2 | false | |
251+
| USE_CUSTOM_HTTP_TRANSPORT | false | |
250252
| USE_EXTERNAL_NODE | false | |
251253
| USE_GIT_CLI | false | |
252254
| USE_IMAGE_TAG_FROM_GIT_PROVIDER_FOR_TAG_BASED_BUILD | false | |

‎go.mod

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@ require (
1717
github.com/casbin/casbin v1.9.1
1818
github.com/casbin/casbin/v2 v2.97.0
1919
github.com/casbin/xorm-adapter v1.0.1-0.20190716004226-a317737a1007
20+
github.com/casbin/xorm-adapter/v2 v2.5.1
2021
github.com/coreos/go-oidc v2.2.1+incompatible
2122
github.com/davecgh/go-spew v1.1.1
2223
github.com/deckarep/golang-set v1.8.0
2324
github.com/devtron-labs/authenticator v0.4.35-0.20240607135426-c86e868ecee1
24-
github.com/devtron-labs/common-lib v0.0.21-0.20240628105542-603b4f777e00
25+
github.com/devtron-labs/common-lib v0.0.21
2526
github.com/devtron-labs/go-bitbucket v0.9.60-beta
2627
github.com/devtron-labs/protos v0.0.3-0.20240527113333-08a3be5ec6c1
2728
github.com/evanphx/json-patch v5.7.0+incompatible
@@ -82,6 +83,7 @@ require (
8283
gopkg.in/go-playground/validator.v9 v9.30.0
8384
gopkg.in/igm/sockjs-go.v3 v3.0.0
8485
gopkg.in/yaml.v2 v2.4.0
86+
helm.sh/helm/v3 v3.14.3
8587
k8s.io/api v0.29.0
8688
k8s.io/apimachinery v0.29.0
8789
k8s.io/client-go v0.29.0
@@ -130,13 +132,13 @@ require (
130132
github.com/bombsimon/logrusr/v2 v2.0.1 // indirect
131133
github.com/bradleyfalzon/ghinstallation/v2 v2.5.0 // indirect
132134
github.com/casbin/govaluate v1.1.0 // indirect
133-
github.com/casbin/xorm-adapter/v2 v2.5.1 // indirect
134135
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
135136
github.com/cespare/xxhash/v2 v2.2.0 // indirect
136137
github.com/chai2010/gettext-go v1.0.2 // indirect
137138
github.com/cloudflare/circl v1.3.7 // indirect
138139
github.com/colinmarc/hdfs v1.1.4-0.20180805212432-9746310a4d31 // indirect
139140
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
141+
github.com/denisenkom/go-mssqldb v0.9.0 // indirect
140142
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
141143
github.com/docker/distribution v2.8.2+incompatible // indirect
142144
github.com/doublerebel/bellows v0.0.0-20160303004610-f177d92a03d3 // indirect
@@ -201,6 +203,7 @@ require (
201203
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
202204
github.com/mailru/easyjson v0.7.7 // indirect
203205
github.com/mattn/go-ieproxy v0.0.1 // indirect
206+
github.com/mattn/go-sqlite3 v1.14.15 // indirect
204207
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
205208
github.com/minio/highwayhash v1.0.2 // indirect
206209
github.com/mitchellh/copystructure v1.2.0 // indirect
@@ -304,6 +307,7 @@ require (
304307
replace (
305308
github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
306309
github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.7-v3refs
310+
helm.sh/helm/v3 v3.14.3 => helm.sh/helm/v3 v3.10.0
307311
k8s.io/api => k8s.io/api v0.26.11
308312
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.11
309313
k8s.io/apimachinery => k8s.io/apimachinery v0.26.11

‎go.sum

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ cloud.google.com/go/storage v1.30.1 h1:uOdMxAs8HExqBlnLtnQyP0YkvbiDpdGShGKtx6U/o
1414
cloud.google.com/go/storage v1.30.1/go.mod h1:NfxhC0UJE1aXSx7CIIbCf7y9HKT7BiccwkR7+P7gN8E=
1515
dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
1616
dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
17+
gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:lSA0F4e9A2NcQSqGqTOXqu2aRi/XEQxDCBwM8yJtE6s=
1718
gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:EXuID2Zs0pAQhH8yz+DNjUbjppKQzKFAn28TMYPB6IU=
1819
github.com/Azure/azure-pipeline-go v0.2.3 h1:7U9HBg1JFK3jHl5qmo4CTZKFTVgMwdFHMVtCdfBE21U=
1920
github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k=
@@ -191,13 +192,14 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
191192
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
192193
github.com/deckarep/golang-set v1.8.0 h1:sk9/l/KqpunDwP7pSjUg0keiOOLEnOBHzykLrsPppp4=
193194
github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo=
194-
github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4 h1:YcpmyvADGYw5LqMnHqSkyIELsHCGF6PkrmM31V8rF7o=
195195
github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4/go.mod h1:zAg7JM8CkOJ43xKXIj7eRO9kmWm/TW578qo+oDO6tuM=
196196
github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
197+
github.com/denisenkom/go-mssqldb v0.9.0 h1:RSohk2RsiZqLZ0zCjtfn3S4Gp4exhpBWHyQ7D0yGjAk=
198+
github.com/denisenkom/go-mssqldb v0.9.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
197199
github.com/devtron-labs/authenticator v0.4.35-0.20240607135426-c86e868ecee1 h1:qdkpTAo2Kr0ZicZIVXfNwsGSshpc9OB9j9RzmKYdIwY=
198200
github.com/devtron-labs/authenticator v0.4.35-0.20240607135426-c86e868ecee1/go.mod h1:IkKPPEfgLCMR29he5yv2OCC6iM2R7K5/0AA3k8b9XNc=
199-
github.com/devtron-labs/common-lib v0.0.21-0.20240628105542-603b4f777e00 h1:xSZulEz0PaTA7tL4Es/uNFUmgjD6oAv8gxJV49GPWHk=
200-
github.com/devtron-labs/common-lib v0.0.21-0.20240628105542-603b4f777e00/go.mod h1:UZGPt1ep9Tnd9Ak2sibGSiLr7p3ijO2/JLT+h+pqBuU=
201+
github.com/devtron-labs/common-lib v0.0.21 h1:vbydiTCdZDtVTPnbB3frJvX/HM0oDe1wA2Schjn6xgw=
202+
github.com/devtron-labs/common-lib v0.0.21/go.mod h1:UZGPt1ep9Tnd9Ak2sibGSiLr7p3ijO2/JLT+h+pqBuU=
201203
github.com/devtron-labs/go-bitbucket v0.9.60-beta h1:VEx1jvDgdtDPS6A1uUFoaEi0l1/oLhbr+90xOwr6sDU=
202204
github.com/devtron-labs/go-bitbucket v0.9.60-beta/go.mod h1:GnuiCesvh8xyHeMCb+twm8lBR/kQzJYSKL28ZfObp1Y=
203205
github.com/devtron-labs/protos v0.0.3-0.20240527113333-08a3be5ec6c1 h1:R6qVeFaayqstBSu4w+ipWQqJyMKDqBVV3a11qoA2IaM=
@@ -317,7 +319,6 @@ github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/me
317319
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
318320
github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68=
319321
github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
320-
github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:9wScpmSP5A3Bk8V3XHWUcJmYTh+ZnlHVyc+A4oZYS3Y=
321322
github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:56xuuqnHyryaerycW3BfssRdxQstACi0Epw/yC5E2xM=
322323
github.com/go-xorm/xorm v0.7.9 h1:LZze6n1UvRmM5gpL9/U9Gucwqo6aWlFVlfcHKH10qA0=
323324
github.com/go-xorm/xorm v0.7.9/go.mod h1:XiVxrMMIhFkwSkh96BW7PACl7UhLtx2iJIHMdmjh5sQ=
@@ -331,6 +332,7 @@ github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69
331332
github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
332333
github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
333334
github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
335+
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
334336
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
335337
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
336338
github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo=
@@ -593,9 +595,10 @@ github.com/mattn/go-ieproxy v0.0.1 h1:qiyop7gCflfhwCzGyeT0gro3sF9AIg9HU98JORTkqf
593595
github.com/mattn/go-ieproxy v0.0.1/go.mod h1:pYabZ6IHcRpFh7vIaLfK7rdcWgFEb3SFJ6/gNWuh88E=
594596
github.com/mattn/go-isatty v0.0.0-20160806122752-66b8e73f3f5c/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
595597
github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
596-
github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o=
597598
github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
598599
github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus=
600+
github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI=
601+
github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
599602
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
600603
github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
601604
github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
@@ -1234,6 +1237,8 @@ gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C
12341237
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
12351238
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
12361239
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
1240+
helm.sh/helm/v3 v3.10.0 h1:y/MYONZ/bsld9kHwqgBX2uPggnUr5hahpjwt9/jrHlI=
1241+
helm.sh/helm/v3 v3.10.0/go.mod h1:paPw0hO5KVfrCMbi1M8+P8xdfBri3IiJiVKATZsFR94=
12371242
honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
12381243
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
12391244
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
@@ -1303,7 +1308,6 @@ sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
13031308
sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
13041309
upper.io/db.v3 v3.8.0+incompatible h1:XNeEO2vQRVqq70M98ghzq6M30F5Bzo+99ess5v+eVYw=
13051310
upper.io/db.v3 v3.8.0+incompatible/go.mod h1:FgTdD24eBjJAbPKsQSiHUNgXjOR4Lub3u1UMHSIh82Y=
1306-
xorm.io/builder v0.3.6 h1:ha28mQ2M+TFx96Hxo+iq6tQgnkC9IZkM6D8w9sKHHF8=
13071311
xorm.io/builder v0.3.6/go.mod h1:LEFAPISnRzG+zxaxj2vPicRwz67BdhFreKg8yv8/TgU=
13081312
xorm.io/builder v0.3.7 h1:2pETdKRK+2QG4mLX4oODHEhn5Z8j1m8sXa7jfu+/SZI=
13091313
xorm.io/builder v0.3.7/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE=

0 commit comments

Comments
 (0)