Skip to content

Commit f159e78

Browse files
prakash100198prakash100198
committed
bump
1 parent 60012ce commit f159e78

File tree

11 files changed

+26
-34
lines changed

11 files changed

+26
-34
lines changed

‎cmd/external-app/wire_gen.go

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

‎env_gen.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎env_gen.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,6 @@
205205
| K8s_TCP_KEEPALIVE | int |30 | | | false |
206206
| K8s_TCP_TIMEOUT | int |30 | | | false |
207207
| K8s_TLS_HANDSHAKE_TIMEOUT | int |10 | | | false |
208-
| KUBELINK_GRPC_MAX_RECEIVE_MSG_SIZE | int |20 | | | false |
209-
| KUBELINK_GRPC_MAX_SEND_MSG_SIZE | int |4 | | | false |
210208
| LENS_TIMEOUT | int |0 | Lens microservice timeout. | | false |
211209
| LENS_URL | string |http://lens-milandevtron-service:80 | Lens micro-service URL | | false |
212210
| LIMIT_CI_CPU | string |0.5 | | | false |
@@ -287,9 +285,13 @@
287285
| DEX_HOST | string |http://localhost | | | false |
288286
| DEX_PORT | string |5556 | | | false |
289287
| GIT_SENSOR_PROTOCOL | string |REST | Protocol to connect with git-sensor micro-service | | false |
288+
| GIT_SENSOR_SERVICE_CONFIG | string |{"loadBalancingPolicy":"pick_first"} | git-sensor grpc service config | | false |
290289
| GIT_SENSOR_TIMEOUT | int |0 | Timeout for getting response from the git-sensor | | false |
291290
| GIT_SENSOR_URL | string |127.0.0.1:7070 | git-sensor micro-service url | | false |
292291
| HELM_CLIENT_URL | string |127.0.0.1:50051 | Kubelink micro-service url | | false |
292+
| KUBELINK_GRPC_MAX_RECEIVE_MSG_SIZE | int |20 | | | false |
293+
| KUBELINK_GRPC_MAX_SEND_MSG_SIZE | int |4 | | | false |
294+
| KUBELINK_GRPC_SERVICE_CONFIG | string |{"loadBalancingPolicy":"round_robin"} | kubelink grpc service config | | false |
293295

294296

295297
## POSTGRES Related Environment Variables

‎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-20250527085745-b13ea5f93409
311-
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250527085745-b13ea5f93409
310+
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250527104213-626bf7f73dc7
311+
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250527104213-626bf7f73dc7
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-20250527085745-b13ea5f93409 h1:F7dVZHaXjvpx2DXczKQ2N5DsBCVCNP3Jh2ZvYV5i8g0=
833-
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250527085745-b13ea5f93409/go.mod h1:FfaLDXN1ZXxyRpnskBqVIYkpkWDCzBmDgIO9xqLnxdQ=
834-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250527085745-b13ea5f93409 h1:kw5A4eieAiYUUVQsFejZtqI/zAuKmzJ+GlZLva5WXyQ=
835-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250527085745-b13ea5f93409/go.mod h1:HQVUnQI7WHwVq89Bib/18xJqM89S1+xI0O7REctMMrA=
832+
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250527104213-626bf7f73dc7 h1:xFZcbpiuKnMwdV5Ow4bd+3yKwwGi+8fS6o6p5DpgSVA=
833+
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250527104213-626bf7f73dc7/go.mod h1:FfaLDXN1ZXxyRpnskBqVIYkpkWDCzBmDgIO9xqLnxdQ=
834+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250527104213-626bf7f73dc7 h1:cdawb4gCbGOLfO8LgBrAvRNizVAQb8WxLLmK2DjVWx4=
835+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250527104213-626bf7f73dc7/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=

‎pkg/cluster/ClusterService.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -486,11 +486,7 @@ func (impl *ClusterServiceImpl) upsertClusterConfigMap(bean *bean.ClusterBean, d
486486
impl.logger.Errorw("error in getting cluster config map", "cmName", cmName, "err", err)
487487
return err
488488
} else if k8sError.IsNotFound(err) {
489-
_, err = impl.K8sUtil.CreateConfigMapObject(bean3.DevtronCDNamespae, k8sClient,
490-
configMap2.WithData(data),
491-
configMap2.WithCmName(cmName),
492-
configMap2.WithLabels(labels))
493-
489+
_, err = impl.K8sUtil.CreateConfigMapObject(cmName, bean3.DevtronCDNamespae, k8sClient, configMap2.WithData(data), configMap2.WithLabels(labels))
494490
if err != nil {
495491
impl.logger.Errorw("error in creating cm object for informer", "cmName", cmName, "err", err)
496492
return err

‎vendor/github.com/devtron-labs/common-lib/utils/k8s/K8sService.go

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

‎vendor/github.com/devtron-labs/common-lib/utils/k8s/K8sUtil.go

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

‎vendor/github.com/devtron-labs/common-lib/utils/k8s/configMap/Options.go

Lines changed: 0 additions & 9 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-20250527085745-b13ea5f93409
475+
# github.com/devtron-labs/authenticator v0.4.35-0.20240809073103-6e11da8083f8 => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250527104213-626bf7f73dc7
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-20250527085745-b13ea5f93409
483+
# github.com/devtron-labs/common-lib v0.18.1-0.20241001061923-eda545dc839e => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250527104213-626bf7f73dc7
484484
## explicit; go 1.21
485485
github.com/devtron-labs/common-lib/async
486486
github.com/devtron-labs/common-lib/blob-storage
@@ -2359,8 +2359,8 @@ xorm.io/xorm/log
23592359
xorm.io/xorm/names
23602360
xorm.io/xorm/schemas
23612361
xorm.io/xorm/tags
2362-
# github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250527085745-b13ea5f93409
2363-
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250527085745-b13ea5f93409
2362+
# github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250527104213-626bf7f73dc7
2363+
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250527104213-626bf7f73dc7
23642364
# github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
23652365
# github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5
23662366
# k8s.io/api => k8s.io/api v0.29.7

0 commit comments

Comments
 (0)