Skip to content

Commit 9a085b5

Browse files
prakash100198prakash100198
committed
code review level 2
1 parent f159e78 commit 9a085b5

File tree

9 files changed

+24
-23
lines changed

9 files changed

+24
-23
lines changed

‎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-20250527104213-626bf7f73dc7
311-
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250527104213-626bf7f73dc7
310+
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250527180844-483d6a266119
311+
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250527180844-483d6a266119
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-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=
832+
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250527180844-483d6a266119 h1:R25JftZLmf3MCpKjsfKJm2Xgu9VvG4wVEdUCB916Jdo=
833+
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250527180844-483d6a266119/go.mod h1:FfaLDXN1ZXxyRpnskBqVIYkpkWDCzBmDgIO9xqLnxdQ=
834+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250527180844-483d6a266119 h1:yFfFWCSt7onH3Jt6yzZseNvpm2OSh+NMGL75ST7eWXw=
835+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250527180844-483d6a266119/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 & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -492,6 +492,7 @@ func (impl *ClusterServiceImpl) upsertClusterConfigMap(bean *bean.ClusterBean, d
492492
return err
493493
}
494494
} else {
495+
configMap.Labels = labels
495496
configMap.Data = data
496497
configMap, err = impl.K8sUtil.UpdateConfigMap(bean3.DevtronCDNamespae, configMap, k8sClient)
497498
if err != nil {

‎pkg/delete/DeleteService.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@ func (impl DeleteServiceImpl) DeleteClusterConfigMap(deleteRequest *bean2.Cluste
114114
err = impl.K8sUtil.DeleteConfigMap(bean4.DevtronCDNamespae, cmName, k8sClient)
115115
if k8sError.IsNotFound(err) {
116116
// when cm not found in devtroncd ns then delete the secret in default ns(secret name would be the same as cm name)
117-
err1 := impl.K8sUtil.DeleteSecret(bean2.DefaultNamespace, cmName, k8sClient)
118-
if err1 != nil {
119-
impl.logger.Errorw("error in deleting cluster secret in default ns ", "secretName", cmName, "err", err1)
120-
return err1
117+
err = impl.K8sUtil.DeleteSecret(bean2.DefaultNamespace, cmName, k8sClient)
118+
if err != nil {
119+
impl.logger.Errorw("error in deleting cluster secret in default ns ", "secretName", cmName, "err", err)
120+
return err
121121
}
122122
} else if err != nil {
123123
impl.logger.Errorw("error in deleting cluster config map in devtroncd ns ", "cmName", cmName, "err", err)

‎vendor/github.com/devtron-labs/common-lib/informer/bean.go‎

Lines changed: 2 additions & 2 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/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: 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/configMap/Options.go‎

Lines changed: 5 additions & 5 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-20250527104213-626bf7f73dc7
475+
# github.com/devtron-labs/authenticator v0.4.35-0.20240809073103-6e11da8083f8 => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250527180844-483d6a266119
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-20250527104213-626bf7f73dc7
483+
# github.com/devtron-labs/common-lib v0.18.1-0.20241001061923-eda545dc839e => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250527180844-483d6a266119
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-20250527104213-626bf7f73dc7
2363-
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250527104213-626bf7f73dc7
2362+
# github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250527180844-483d6a266119
2363+
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250527180844-483d6a266119
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)