Skip to content

Commit b949491

Browse files
added ext argo router in ea mode (#5585)
1 parent b05a663 commit b949491

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

cmd/external-app/router.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
appStoreDeployment "github.com/devtron-labs/devtron/api/appStore/deployment"
2424
appStoreDiscover "github.com/devtron-labs/devtron/api/appStore/discover"
2525
appStoreValues "github.com/devtron-labs/devtron/api/appStore/values"
26+
"github.com/devtron-labs/devtron/api/argoApplication"
2627
"github.com/devtron-labs/devtron/api/auth/sso"
2728
"github.com/devtron-labs/devtron/api/auth/user"
2829
"github.com/devtron-labs/devtron/api/chartRepo"
@@ -80,6 +81,7 @@ type MuxRouter struct {
8081
attributesRouter router.AttributesRouter
8182
appRouter app.AppRouterEAMode
8283
rbacRoleRouter user.RbacRoleRouter
84+
argoApplicationRouter argoApplication.ArgoApplicationRouter
8385
}
8486

8587
func NewMuxRouter(
@@ -111,7 +113,7 @@ func NewMuxRouter(
111113
userTerminalAccessRouter terminal.UserTerminalAccessRouter,
112114
attributesRouter router.AttributesRouter,
113115
appRouter app.AppRouterEAMode,
114-
rbacRoleRouter user.RbacRoleRouter,
116+
rbacRoleRouter user.RbacRoleRouter, argoApplicationRouter argoApplication.ArgoApplicationRouter,
115117
) *MuxRouter {
116118
r := &MuxRouter{
117119
Router: mux.NewRouter(),
@@ -145,6 +147,7 @@ func NewMuxRouter(
145147
attributesRouter: attributesRouter,
146148
appRouter: appRouter,
147149
rbacRoleRouter: rbacRoleRouter,
150+
argoApplicationRouter: argoApplicationRouter,
148151
}
149152
return r
150153
}
@@ -277,4 +280,7 @@ func (r *MuxRouter) Init() {
277280

278281
attributeRouter := r.Router.PathPrefix("/orchestrator/attributes").Subrouter()
279282
r.attributesRouter.InitAttributesRouter(attributeRouter)
283+
284+
argoApplicationRouter := r.Router.PathPrefix("/orchestrator/argo-application").Subrouter()
285+
r.argoApplicationRouter.InitArgoApplicationRouter(argoApplicationRouter)
280286
}

cmd/external-app/wire_gen.go

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

env_gen.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
| APP_SYNC_JOB_RESOURCES_OBJ | | |
1212
| ARGO_APP_MANUAL_SYNC_TIME | 3 | |
1313
| ARGO_AUTO_SYNC_ENABLED | true | |
14-
| ASYNC_BUILDX_CACHE_EXPORT | false | |
1514
| ARGO_GIT_COMMIT_RETRY_COUNT_ON_CONFLICT | 3 | |
1615
| ARGO_GIT_COMMIT_RETRY_DELAY_ON_CONFLICT | 1 | |
1716
| ARGO_REPO_REGISTER_RETRY_COUNT | 3 | |
1817
| ARGO_REPO_REGISTER_RETRY_DELAY | 10 | |
18+
| ASYNC_BUILDX_CACHE_EXPORT | false | |
1919
| AZURE_ACCOUNT_KEY | | |
2020
| AZURE_ACCOUNT_NAME | | |
2121
| AZURE_BLOB_CONTAINER_CI_CACHE | | |

0 commit comments

Comments
 (0)