Skip to content

Commit d0bef6a

Browse files
fix: resource-browser-shortnames (#5573)
* synced with the common lib * added the assets of argocd in vendor * synced with common lib * synced with the common-lib * took merge and executed the make
1 parent 3b93cd1 commit d0bef6a

File tree

7 files changed

+8
-5
lines changed

7 files changed

+8
-5
lines changed

env_gen.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
| APP | orchestrator | |
1010
| APP_SYNC_IMAGE | quay.io/devtron/chart-sync:1227622d-132-3775 | |
1111
| APP_SYNC_JOB_RESOURCES_OBJ | | |
12+
| APP_SYNC_SERVICE_ACCOUNT | chart-sync | |
1213
| ARGO_APP_MANUAL_SYNC_TIME | 3 | |
1314
| ARGO_AUTO_SYNC_ENABLED | true | |
1415
| ARGO_GIT_COMMIT_RETRY_COUNT_ON_CONFLICT | 3 | |

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ require (
2222
github.com/davecgh/go-spew v1.1.1
2323
github.com/deckarep/golang-set v1.8.0
2424
github.com/devtron-labs/authenticator v0.4.35-0.20240607135426-c86e868ecee1
25-
github.com/devtron-labs/common-lib v0.0.25-0.20240725070144-e3d60fb56a8c
25+
github.com/devtron-labs/common-lib v0.0.25-0.20240726165557-8dad78ef6731
2626
github.com/devtron-labs/go-bitbucket v0.9.60-beta
2727
github.com/devtron-labs/protos v0.0.3-0.20240726064057-dd2990c91e41
2828
github.com/evanphx/json-patch v5.7.0+incompatible

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,8 @@ github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc h1:VRRKCwnzq
197197
github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
198198
github.com/devtron-labs/authenticator v0.4.35-0.20240607135426-c86e868ecee1 h1:qdkpTAo2Kr0ZicZIVXfNwsGSshpc9OB9j9RzmKYdIwY=
199199
github.com/devtron-labs/authenticator v0.4.35-0.20240607135426-c86e868ecee1/go.mod h1:IkKPPEfgLCMR29he5yv2OCC6iM2R7K5/0AA3k8b9XNc=
200-
github.com/devtron-labs/common-lib v0.0.25-0.20240725070144-e3d60fb56a8c h1:RNgdO5nUUi/NAh7G0JJGwPCN9gNv5MJZszArG14NjdM=
201-
github.com/devtron-labs/common-lib v0.0.25-0.20240725070144-e3d60fb56a8c/go.mod h1:UZGPt1ep9Tnd9Ak2sibGSiLr7p3ijO2/JLT+h+pqBuU=
200+
github.com/devtron-labs/common-lib v0.0.25-0.20240726165557-8dad78ef6731 h1:BF6RTdwkT0qVqLvvJHZ6CaRV94GxlOj+n6JkEExEKyo=
201+
github.com/devtron-labs/common-lib v0.0.25-0.20240726165557-8dad78ef6731/go.mod h1:UZGPt1ep9Tnd9Ak2sibGSiLr7p3ijO2/JLT+h+pqBuU=
202202
github.com/devtron-labs/go-bitbucket v0.9.60-beta h1:VEx1jvDgdtDPS6A1uUFoaEi0l1/oLhbr+90xOwr6sDU=
203203
github.com/devtron-labs/go-bitbucket v0.9.60-beta/go.mod h1:GnuiCesvh8xyHeMCb+twm8lBR/kQzJYSKL28ZfObp1Y=
204204
github.com/devtron-labs/protos v0.0.3-0.20240726064057-dd2990c91e41 h1:tIoWy1PDAC6enSBohRt0qroiRXq+bR7qlqk73JlQ9R4=

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/github.com/devtron-labs/common-lib/utils/k8s/bean.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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ github.com/devtron-labs/authenticator/jwt
402402
github.com/devtron-labs/authenticator/middleware
403403
github.com/devtron-labs/authenticator/oidc
404404
github.com/devtron-labs/authenticator/password
405-
# github.com/devtron-labs/common-lib v0.0.25-0.20240725070144-e3d60fb56a8c
405+
# github.com/devtron-labs/common-lib v0.0.25-0.20240726165557-8dad78ef6731
406406
## explicit; go 1.21
407407
github.com/devtron-labs/common-lib/async
408408
github.com/devtron-labs/common-lib/blob-storage

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.

0 commit comments

Comments
 (0)