Skip to content

Commit fccc0a5

Browse files
Merge pull request #6236 from devtron-labs/vendor-update-on-rc26
misc: Vendor update on rc26
2 parents 1da9a50 + b9c6767 commit fccc0a5

File tree

5 files changed

+32
-11
lines changed

5 files changed

+32
-11
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,8 @@ require gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
288288

289289
replace (
290290
github.com/argoproj/argo-workflows/v3 v3.5.10 => github.com/devtron-labs/argo-workflows/v3 v3.5.10
291-
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20241219033445-6c0c7082c583
292-
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241225093445-23a98e8bb120
291+
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20241230062959-878e8a06fde8
292+
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241230062959-878e8a06fde8
293293
github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
294294
github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5
295295
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
@@ -792,10 +792,10 @@ github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc h1:VRRKCwnzq
792792
github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
793793
github.com/devtron-labs/argo-workflows/v3 v3.5.10 h1:6rxQOesOzDz6SgQCMDQNHaehsKFW3C7U8CZeEek5kgQ=
794794
github.com/devtron-labs/argo-workflows/v3 v3.5.10/go.mod h1:/vqxcovDPT4zqr4DjR5v7CF8ggpY1l3TSa2CIG3jmjA=
795-
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20241219033445-6c0c7082c583 h1:YN6O8N4+msUbbmWB+QOpq6ha7hCjF/kkds9bsOZ0EWg=
796-
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20241219033445-6c0c7082c583/go.mod h1:vFJ3M7akwAWCtugDXRW+5Q9P+cp0RiH+K/D5FBbb/JA=
797-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241225093445-23a98e8bb120 h1:HiYR58c/pglJSD79oKUQ2wu/K/aV4G4cQwvgJs/nB/4=
798-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241225093445-23a98e8bb120/go.mod h1:NJSMdv+zTUK3p7rML12RZSeAUKHeLaoY3sR/oK0xhwo=
795+
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20241230062959-878e8a06fde8 h1:BhzbGs2cs1Xff0fYMPIvoswiyQqAS26VH3GXcsSVXJw=
796+
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20241230062959-878e8a06fde8/go.mod h1:vFJ3M7akwAWCtugDXRW+5Q9P+cp0RiH+K/D5FBbb/JA=
797+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241230062959-878e8a06fde8 h1:PQsRc0rk4Cl0QfdgIlgffIyG/f1iuoh/aFf+z5kKf9M=
798+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241230062959-878e8a06fde8/go.mod h1:NJSMdv+zTUK3p7rML12RZSeAUKHeLaoY3sR/oK0xhwo=
799799
github.com/devtron-labs/go-bitbucket v0.9.60-beta h1:VEx1jvDgdtDPS6A1uUFoaEi0l1/oLhbr+90xOwr6sDU=
800800
github.com/devtron-labs/go-bitbucket v0.9.60-beta/go.mod h1:GnuiCesvh8xyHeMCb+twm8lBR/kQzJYSKL28ZfObp1Y=
801801
github.com/devtron-labs/protos v0.0.3-0.20240802105333-92ee9bb85d80 h1:xwbTeijNTf4/j1v+tSfwVqwLVnReas/NqEKeQHvSTys=

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

Lines changed: 21 additions & 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 & 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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -336,15 +336,15 @@ github.com/davecgh/go-spew/spew
336336
# github.com/deckarep/golang-set v1.8.0
337337
## explicit; go 1.17
338338
github.com/deckarep/golang-set
339-
# github.com/devtron-labs/authenticator v0.4.35-0.20240809073103-6e11da8083f8 => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20241219033445-6c0c7082c583
339+
# github.com/devtron-labs/authenticator v0.4.35-0.20240809073103-6e11da8083f8 => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20241230062959-878e8a06fde8
340340
## explicit; go 1.21
341341
github.com/devtron-labs/authenticator/apiToken
342342
github.com/devtron-labs/authenticator/client
343343
github.com/devtron-labs/authenticator/jwt
344344
github.com/devtron-labs/authenticator/middleware
345345
github.com/devtron-labs/authenticator/oidc
346346
github.com/devtron-labs/authenticator/password
347-
# github.com/devtron-labs/common-lib v0.18.1-0.20241001061923-eda545dc839e => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241225093445-23a98e8bb120
347+
# github.com/devtron-labs/common-lib v0.18.1-0.20241001061923-eda545dc839e => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241230062959-878e8a06fde8
348348
## explicit; go 1.21
349349
github.com/devtron-labs/common-lib/async
350350
github.com/devtron-labs/common-lib/blob-storage
@@ -2214,8 +2214,8 @@ xorm.io/xorm/log
22142214
xorm.io/xorm/names
22152215
xorm.io/xorm/schemas
22162216
xorm.io/xorm/tags
2217-
# github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20241219033445-6c0c7082c583
2218-
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241225093445-23a98e8bb120
2217+
# github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20241230062959-878e8a06fde8
2218+
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241230062959-878e8a06fde8
22192219
# github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
22202220
# github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5
22212221
# k8s.io/api => k8s.io/api v0.29.7

0 commit comments

Comments
 (0)