Skip to content

Commit 943d18f

Browse files
kartik-579kartik-579
authored
Merge pull request #6610 from devtron-labs/grpc-git-sensor-config-change
chore: git sensor grpc lb policy change
2 parents 6d7e538 + e08c972 commit 943d18f

File tree

7 files changed

+20
-17
lines changed

7 files changed

+20
-17
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ func (impl *HelmAppClientImpl) getConnection() (*grpc.ClientConn, error) {
107107
grpc.MaxCallRecvMsgSize(impl.grpcConfig.KubelinkMaxSendMsgSize*1024*1024), // GRPC Request size
108108
grpc.MaxCallSendMsgSize(impl.grpcConfig.KubelinkMaxRecvMsgSize*1024*1024), // GRPC Response size
109109
),
110-
grpc.WithDefaultServiceConfig(`{"loadBalancingPolicy":"round_robin"}`),
110+
grpc.WithDefaultServiceConfig(impl.grpcConfig.KubelinkGRPCServiceConfig),
111111
)
112112
endpoint := fmt.Sprintf("dns:///%s", impl.helmClientConfig.Url)
113113
conn, err := grpc.DialContext(ctx, endpoint, opts...)

‎client/gitSensor/GitSensorClient.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,10 @@ func NewGitSensorClient(logger *zap.SugaredLogger, config *ClientConfig) (*Clien
8181

8282
// CATEGORY=INFRA_SETUP
8383
type ClientConfig struct {
84-
Url string `env:"GIT_SENSOR_URL" envDefault:"127.0.0.1:7070" description:"git-sensor micro-service url "`
85-
Protocol string `env:"GIT_SENSOR_PROTOCOL" envDefault:"REST" description:"Protocol to connect with git-sensor micro-service"`
86-
Timeout int `env:"GIT_SENSOR_TIMEOUT" envDefault:"0" description:"Timeout for getting response from the git-sensor"` // in seconds
84+
Url string `env:"GIT_SENSOR_URL" envDefault:"127.0.0.1:7070" description:"git-sensor micro-service url "`
85+
Protocol string `env:"GIT_SENSOR_PROTOCOL" envDefault:"REST" description:"Protocol to connect with git-sensor micro-service"`
86+
Timeout int `env:"GIT_SENSOR_TIMEOUT" envDefault:"0" description:"Timeout for getting response from the git-sensor"` // in seconds
87+
ServiceConfig string `env:"GIT_SENSOR_SERVICE_CONFIG" envDefault:"{\"loadBalancingPolicy\":\"pick_first\"}" description:"git-sensor grpc service config"`
8788
}
8889

8990
func GetConfig() (*ClientConfig, error) {

‎client/gitSensor/GitSensorGrpcClient.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func (client *GrpcApiClientImpl) getConnection() (*grpc.ClientConn, error) {
9090
grpc.WithChainUnaryInterceptor(grpc_prometheus.UnaryClientInterceptor, otelgrpc.UnaryClientInterceptor()),
9191
grpc.WithBlock(),
9292
grpc.WithTransportCredentials(insecure.NewCredentials()),
93-
grpc.WithDefaultServiceConfig(`{"loadBalancingPolicy":"round_robin"}`),
93+
grpc.WithDefaultServiceConfig(client.config.ServiceConfig),
9494
)
9595
endpoint := fmt.Sprintf("dns:///%s", client.config.Url)
9696

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,8 @@ require (
307307

308308
replace (
309309
github.com/argoproj/argo-workflows/v3 v3.5.13 => github.com/devtron-labs/argo-workflows/v3 v3.5.13
310-
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250522104903-ba0d761f14a3
311-
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250522104903-ba0d761f14a3
310+
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250526125952-d9add5acd6a4
311+
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250526125952-d9add5acd6a4
312312
github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
313313
github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5
314314
k8s.io/api => k8s.io/api v0.29.7

‎go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -829,10 +829,10 @@ github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc h1:VRRKCwnzq
829829
github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
830830
github.com/devtron-labs/argo-workflows/v3 v3.5.13 h1:3pINq0gXOSeTw2z/vYe+j80lRpSN5Rp/8mfQORh8SmU=
831831
github.com/devtron-labs/argo-workflows/v3 v3.5.13/go.mod h1:/vqxcovDPT4zqr4DjR5v7CF8ggpY1l3TSa2CIG3jmjA=
832-
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250522104903-ba0d761f14a3 h1:YJDD0cAB88y8NaTf1L10lrWavjRz9wTUVVBLk3dZeHI=
833-
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250522104903-ba0d761f14a3/go.mod h1:FfaLDXN1ZXxyRpnskBqVIYkpkWDCzBmDgIO9xqLnxdQ=
834-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250522104903-ba0d761f14a3 h1:Tms2vTi1npEHJtHf0RtqD9xBQNkCP3J0xMNXGzKSIOA=
835-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250522104903-ba0d761f14a3/go.mod h1:HQVUnQI7WHwVq89Bib/18xJqM89S1+xI0O7REctMMrA=
832+
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250526125952-d9add5acd6a4 h1:oN526uO6xFroV22CvVAgnXHd8rXoIdTdQQ5qjBQ3tDE=
833+
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250526125952-d9add5acd6a4/go.mod h1:FfaLDXN1ZXxyRpnskBqVIYkpkWDCzBmDgIO9xqLnxdQ=
834+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250526125952-d9add5acd6a4 h1:6IITdigvNJgWhEQ1T0KlzsYwT18G67H32ggBM0prxpk=
835+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250526125952-d9add5acd6a4/go.mod h1:HQVUnQI7WHwVq89Bib/18xJqM89S1+xI0O7REctMMrA=
836836
github.com/devtron-labs/go-bitbucket v0.9.60-beta h1:VEx1jvDgdtDPS6A1uUFoaEi0l1/oLhbr+90xOwr6sDU=
837837
github.com/devtron-labs/go-bitbucket v0.9.60-beta/go.mod h1:GnuiCesvh8xyHeMCb+twm8lBR/kQzJYSKL28ZfObp1Y=
838838
github.com/devtron-labs/protos v0.0.3-0.20250323220609-ecf8a0f7305e h1:U6UdYbW8a7xn5IzFPd8cywjVVPfutGJCudjePAfL/Hs=

‎vendor/github.com/devtron-labs/common-lib/utils/grpc/GrpcConfig.go

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/modules.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -472,15 +472,15 @@ github.com/davecgh/go-spew/spew
472472
# github.com/deckarep/golang-set v1.8.0
473473
## explicit; go 1.17
474474
github.com/deckarep/golang-set
475-
# github.com/devtron-labs/authenticator v0.4.35-0.20240809073103-6e11da8083f8 => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250522104903-ba0d761f14a3
475+
# github.com/devtron-labs/authenticator v0.4.35-0.20240809073103-6e11da8083f8 => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250526125952-d9add5acd6a4
476476
## explicit; go 1.21
477477
github.com/devtron-labs/authenticator/apiToken
478478
github.com/devtron-labs/authenticator/client
479479
github.com/devtron-labs/authenticator/jwt
480480
github.com/devtron-labs/authenticator/middleware
481481
github.com/devtron-labs/authenticator/oidc
482482
github.com/devtron-labs/authenticator/password
483-
# github.com/devtron-labs/common-lib v0.18.1-0.20241001061923-eda545dc839e => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250522104903-ba0d761f14a3
483+
# github.com/devtron-labs/common-lib v0.18.1-0.20241001061923-eda545dc839e => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250526125952-d9add5acd6a4
484484
## explicit; go 1.21
485485
github.com/devtron-labs/common-lib/async
486486
github.com/devtron-labs/common-lib/blob-storage
@@ -2358,8 +2358,8 @@ xorm.io/xorm/log
23582358
xorm.io/xorm/names
23592359
xorm.io/xorm/schemas
23602360
xorm.io/xorm/tags
2361-
# github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250522104903-ba0d761f14a3
2362-
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250522104903-ba0d761f14a3
2361+
# github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250526125952-d9add5acd6a4
2362+
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250526125952-d9add5acd6a4
23632363
# github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
23642364
# github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5
23652365
# k8s.io/api => k8s.io/api v0.29.7

0 commit comments

Comments
 (0)