Update from component template

Template version: main (`98d16f9`)
projectsyn · Jan 7, 2025 · 994204f · 994204f
1 parent aa286c3
commit 994204f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/.cruft.json b/.cruft.json
@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/projectsyn/commodore-component-template.git",
-  "commit": "8840f87d25d97ce0d4bfed75d40173caaf4100fc",
+  "commit": "98d16f99766e6c6d97322dbe42e058f0e2bf73d0",
   "checkout": "main",
   "context": {
     "cookiecutter": {

diff --git a/class/defaults.yml b/class/defaults.yml
@@ -1,5 +1,7 @@
 parameters:
   metallb:
+    =_metadata:
+      multi_tenant: true
     namespace: syn-metallb
     name: metallb
     memberlist_secretkey: ?{vaultkv:${cluster:tenant}/${cluster:name}/metallb-memberlist/secretkey}

diff --git a/class/metallb.yml b/class/metallb.yml
@@ -10,7 +10,7 @@ parameters:
       - input_paths:
           - metallb/component/app.jsonnet
         input_type: jsonnet
-        output_path: apps/
+        output_path: .
       - input_paths:
           - metallb/component/main.jsonnet
         input_type: jsonnet

diff --git a/component/app.jsonnet b/component/app.jsonnet
@@ -17,6 +17,10 @@ local app = argocd.App('metallb', params.namespace) {
   },
 };
 
+local appPath =
+  local project = std.get(std.get(app, 'spec', {}), 'project', 'syn');
+  if project == 'syn' then 'apps' else 'apps-%s' % project;
+
 {
-  metallb: app,
+  ['%s/metallb' % appPath]: app,
 }