Skip to content

Commit 976f93b

Browse files
prakash100198prakash100198
committed
bump common lib
1 parent 8237884 commit 976f93b

File tree

7 files changed

+77
-29
lines changed

7 files changed

+77
-29
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-20250523142930-01ed8fbeb6e5
311-
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250523142930-01ed8fbeb6e5
310+
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250527075747-f3a156dfc166
311+
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250527075747-f3a156dfc166
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-20250523142930-01ed8fbeb6e5 h1:PYrpBS2NM9MlfacQuiBm5cElBqN2ER8VQfnjp2zqghw=
833-
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250523142930-01ed8fbeb6e5/go.mod h1:FfaLDXN1ZXxyRpnskBqVIYkpkWDCzBmDgIO9xqLnxdQ=
834-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250523142930-01ed8fbeb6e5 h1:Wame1Nk/8TuGPcSMzp81DOqFw5Kpd+Q9Q+/ZjZFKCz4=
835-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250523142930-01ed8fbeb6e5/go.mod h1:HQVUnQI7WHwVq89Bib/18xJqM89S1+xI0O7REctMMrA=
832+
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250527075747-f3a156dfc166 h1:sF504bdxYAg3THEEtKD0FlUXM5Ks2zJuImH+Dn2zDAw=
833+
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250527075747-f3a156dfc166/go.mod h1:FfaLDXN1ZXxyRpnskBqVIYkpkWDCzBmDgIO9xqLnxdQ=
834+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250527075747-f3a156dfc166 h1:DSKeSr41NB3jNv9k4aic4fRc+aKHg8oAcTOeljOvUqQ=
835+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250527075747-f3a156dfc166/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: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"fmt"
2323
informerBean "github.com/devtron-labs/common-lib/informer"
2424
"github.com/devtron-labs/common-lib/utils/k8s/commonBean"
25+
configMap2 "github.com/devtron-labs/common-lib/utils/k8s/configMap"
2526
bean3 "github.com/devtron-labs/devtron/pkg/argoApplication/bean"
2627
"github.com/devtron-labs/devtron/pkg/cluster/adapter"
2728
"github.com/devtron-labs/devtron/pkg/cluster/bean"
@@ -481,7 +482,11 @@ func (impl *ClusterServiceImpl) upsertClusterConfigMap(bean *bean.ClusterBean, d
481482
impl.logger.Errorw("error in getting cluster config map", "cmName", cmName, "err", err)
482483
return err
483484
} else if k8sError.IsNotFound(err) {
484-
_, err = impl.K8sUtil.CreateConfigMapObject(bean3.DevtronCDNamespae, data, cmName, k8sClient, labels, nil)
485+
_, err = impl.K8sUtil.CreateConfigMapObject(bean3.DevtronCDNamespae, k8sClient,
486+
configMap2.WithData(data),
487+
configMap2.WithCmName(cmName),
488+
configMap2.WithLabels(labels))
489+
485490
if err != nil {
486491
impl.logger.Errorw("error in creating cm object for informer", "cmName", cmName, "err", err)
487492
return err

‎vendor/github.com/devtron-labs/common-lib/utils/k8s/K8sService.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/K8sUtil.go

Lines changed: 6 additions & 16 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: 52 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/modules.txt

Lines changed: 5 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-20250523142930-01ed8fbeb6e5
475+
# github.com/devtron-labs/authenticator v0.4.35-0.20240809073103-6e11da8083f8 => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250527075747-f3a156dfc166
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-20250523142930-01ed8fbeb6e5
483+
# github.com/devtron-labs/common-lib v0.18.1-0.20241001061923-eda545dc839e => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250527075747-f3a156dfc166
484484
## explicit; go 1.21
485485
github.com/devtron-labs/common-lib/async
486486
github.com/devtron-labs/common-lib/blob-storage
@@ -504,6 +504,7 @@ github.com/devtron-labs/common-lib/utils/grpc
504504
github.com/devtron-labs/common-lib/utils/http
505505
github.com/devtron-labs/common-lib/utils/k8s
506506
github.com/devtron-labs/common-lib/utils/k8s/commonBean
507+
github.com/devtron-labs/common-lib/utils/k8s/configMap
507508
github.com/devtron-labs/common-lib/utils/k8s/health
508509
github.com/devtron-labs/common-lib/utils/k8sObjectsUtil
509510
github.com/devtron-labs/common-lib/utils/registry
@@ -2358,8 +2359,8 @@ xorm.io/xorm/log
23582359
xorm.io/xorm/names
23592360
xorm.io/xorm/schemas
23602361
xorm.io/xorm/tags
2361-
# github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250523142930-01ed8fbeb6e5
2362-
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250523142930-01ed8fbeb6e5
2362+
# github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250527075747-f3a156dfc166
2363+
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250527075747-f3a156dfc166
23632364
# github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
23642365
# github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5
23652366
# k8s.io/api => k8s.io/api v0.29.7

0 commit comments

Comments
 (0)