AppManager: monitor installed HelmRelease resources
Change-Id: Ia036e7dda8136ad696d8222e799c4d1b6a9018a9
diff --git a/core/installer/cmd/app_manager.go b/core/installer/cmd/app_manager.go
index ee21ba0..abdd475 100644
--- a/core/installer/cmd/app_manager.go
+++ b/core/installer/cmd/app_manager.go
@@ -104,6 +104,10 @@
} else {
r = installer.NewInMemoryAppRepository(installer.CreateStoreApps())
}
+ helmMon, err := newHelmReleaseMonitor()
+ if err != nil {
+ return err
+ }
s := welcome.NewAppManagerServer(
appManagerFlags.port,
m,
@@ -112,6 +116,7 @@
"http://fluxcd-reconciler.dodo-fluxcd-reconciler.svc.cluster.local",
env.Id,
),
+ helmMon,
)
return s.Start()
}
diff --git a/core/installer/cmd/kube.go b/core/installer/cmd/kube.go
index d06ae59..4c6ab59 100644
--- a/core/installer/cmd/kube.go
+++ b/core/installer/cmd/kube.go
@@ -11,3 +11,7 @@
func newZoneFetcher() (installer.ZoneStatusFetcher, error) {
return installer.NewZoneStatusFetcher(rootFlags.kubeConfig)
}
+
+func newHelmReleaseMonitor() (installer.HelmReleaseMonitor, error) {
+ return installer.NewHelmReleaseMonitor(rootFlags.kubeConfig)
+}
diff --git a/core/installer/cmd/rewrite.go b/core/installer/cmd/rewrite.go
index 44f499a..8bb9173 100644
--- a/core/installer/cmd/rewrite.go
+++ b/core/installer/cmd/rewrite.go
@@ -84,7 +84,7 @@
return err
}
v := inst.InputToValues(app.Schema())
- if err := mgr.Update(app, inst.Id, v, soft.WithNoCommit()); err != nil {
+ if _, err := mgr.Update(app, inst.Id, v, soft.WithNoCommit()); err != nil {
return err
}
}