Installer: Separate infrastructure and environment apps.
Have two separate application managers, one for installing apps on the
dodo infra, and nother installing on individual environments.
Change-Id: I1b24f008e30c5533c48c22ea92328bc4bb7abc54
diff --git a/core/installer/tasks/env.go b/core/installer/tasks/env.go
index 7eaf0da..68fbe57 100644
--- a/core/installer/tasks/env.go
+++ b/core/installer/tasks/env.go
@@ -12,16 +12,17 @@
)
type state struct {
- infoListener EnvInfoListener
- publicIPs []net.IP
- nsCreator installer.NamespaceCreator
- repo installer.RepoIO
- ssAdminKeys *keygen.KeyPair
- ssClient *soft.Client
- fluxUserName string
- keys *keygen.KeyPair
- appManager *installer.AppManager
- appsRepo installer.AppRepository
+ infoListener EnvInfoListener
+ publicIPs []net.IP
+ nsCreator installer.NamespaceCreator
+ repo installer.RepoIO
+ ssAdminKeys *keygen.KeyPair
+ ssClient *soft.Client
+ fluxUserName string
+ keys *keygen.KeyPair
+ appManager *installer.AppManager
+ appsRepo installer.AppRepository
+ infraAppManager *installer.InfraAppManager
}
type Env struct {
@@ -46,13 +47,15 @@
startIP net.IP,
nsCreator installer.NamespaceCreator,
repo installer.RepoIO,
+ mgr *installer.InfraAppManager,
infoListener EnvInfoListener,
) (Task, DNSZoneRef) {
st := state{
- infoListener: infoListener,
- publicIPs: publicIPs,
- nsCreator: nsCreator,
- repo: repo,
+ infoListener: infoListener,
+ publicIPs: publicIPs,
+ nsCreator: nsCreator,
+ repo: repo,
+ infraAppManager: mgr,
}
t := newSequentialParentTask(
"Create env",