AppManager: clean up UI
Change-Id: I8119ea81c80ff6165f4217dfdf9837e776703fc0
diff --git a/core/installer/app_repository.go b/core/installer/app_repository.go
index 6acde70..5727e64 100644
--- a/core/installer/app_repository.go
+++ b/core/installer/app_repository.go
@@ -17,22 +17,24 @@
//go:embed values-tmpl
var valuesTmpls embed.FS
-var storeAppConfigs = []string{
- "values-tmpl/jellyfin.cue",
- // "values-tmpl/maddy.cue",
- "values-tmpl/matrix.cue",
- "values-tmpl/penpot.cue",
- "values-tmpl/pihole.cue",
- "values-tmpl/qbittorrent.cue",
- "values-tmpl/rpuppy.cue",
- "values-tmpl/soft-serve.cue",
- "values-tmpl/vaultwarden.cue",
+var storeEnvAppConfigs = []string{
"values-tmpl/url-shortener.cue",
+ "values-tmpl/matrix.cue",
+ "values-tmpl/vaultwarden.cue",
+ "values-tmpl/open-project.cue",
"values-tmpl/gerrit.cue",
"values-tmpl/jenkins.cue",
"values-tmpl/zot.cue",
- "values-tmpl/open-project.cue",
- // TODO(gio): should be part of env infra
+ "values-tmpl/penpot.cue",
+ "values-tmpl/soft-serve.cue",
+ "values-tmpl/pihole.cue",
+ // "values-tmpl/maddy.cue",
+ "values-tmpl/qbittorrent.cue",
+ "values-tmpl/jellyfin.cue",
+ "values-tmpl/rpuppy.cue",
+}
+
+var envAppConfigs = []string{
"values-tmpl/certificate-issuer-private.cue",
"values-tmpl/certificate-issuer-public.cue",
"values-tmpl/appmanager.cue",
@@ -75,7 +77,7 @@
func (r InMemoryAppRepository) Find(name string) (App, error) {
for _, a := range r.apps {
- if a.Name() == name {
+ if a.Slug() == name {
return a, nil
}
}
@@ -89,13 +91,20 @@
func CreateAllApps() []App {
return append(
createInfraApps(),
- CreateStoreApps()...,
+ append(
+ CreateEnvApps(storeEnvAppConfigs),
+ CreateEnvApps(envAppConfigs)...,
+ )...,
)
}
func CreateStoreApps() []App {
+ return CreateEnvApps(storeEnvAppConfigs)
+}
+
+func CreateEnvApps(configs []string) []App {
ret := make([]App, 0)
- for _, cfgFile := range storeAppConfigs {
+ for _, cfgFile := range configs {
contents, err := valuesTmpls.ReadFile(cfgFile)
if err != nil {
panic(err)