Reconciler: Reconcile dodo Apps as well
Fix service-account assignment.
Change-Id: Ic66c46ae5b728e09ee9118f61e31ab860623bce0
diff --git a/core/installer/cmd/app_manager.go b/core/installer/cmd/app_manager.go
index 33f122d..c03c83e 100644
--- a/core/installer/cmd/app_manager.go
+++ b/core/installer/cmd/app_manager.go
@@ -117,10 +117,7 @@
appManagerFlags.port,
m,
r,
- tasks.NewFluxcdReconciler(
- "http://fluxcd-reconciler.dodo-fluxcd-reconciler.svc.cluster.local",
- env.Id,
- ),
+ tasks.NewFixedReconciler(env.Id, env.Id),
helmMon,
)
if err != nil {
diff --git a/core/installer/cmd/dodo_app.go b/core/installer/cmd/dodo_app.go
index ef62f5c..f61ee78 100644
--- a/core/installer/cmd/dodo_app.go
+++ b/core/installer/cmd/dodo_app.go
@@ -8,6 +8,7 @@
"github.com/giolekva/pcloud/core/installer"
"github.com/giolekva/pcloud/core/installer/soft"
+ "github.com/giolekva/pcloud/core/installer/tasks"
"github.com/giolekva/pcloud/core/installer/welcome"
_ "github.com/ncruces/go-sqlite3"
@@ -186,6 +187,12 @@
} else {
ug = welcome.NewInternalUserGetter()
}
+ reconciler := &tasks.SequentialReconciler{
+ []tasks.Reconciler{
+ &tasks.SourceGitReconciler{},
+ // &tasks.KustomizationReconciler{},
+ },
+ }
s, err := welcome.NewDodoAppServer(
st,
nf,
@@ -204,6 +211,7 @@
env,
dodoAppFlags.external,
dodoAppFlags.fetchUsersAddr,
+ reconciler,
)
if err != nil {
return err