From 4a2a421b0fd3465381038841cae89fdb33dc4eee Mon Sep 17 00:00:00 2001 From: Simon Gerber Date: Tue, 7 Jan 2025 17:32:40 +0100 Subject: [PATCH] Update from component template Template version: main (`98d16f9`) --- .cruft.json | 2 +- class/defaults.yml | 2 ++ class/storageclass.yml | 2 +- component/app.jsonnet | 6 +++++- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.cruft.json b/.cruft.json index 396fa48..ec0efa5 100644 --- 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 index cd7a394..e7049f2 100644 --- a/class/defaults.yml +++ b/class/defaults.yml @@ -1,5 +1,7 @@ parameters: storageclass: + =_metadata: + multi_tenant: true defaults: volumeBindingMode: WaitForFirstConsumer reclaimPolicy: Delete diff --git a/class/storageclass.yml b/class/storageclass.yml index 65cdc64..8786b99 100644 --- a/class/storageclass.yml +++ b/class/storageclass.yml @@ -4,7 +4,7 @@ parameters: - input_paths: - storageclass/component/app.jsonnet input_type: jsonnet - output_path: apps/ + output_path: . - input_paths: - storageclass/component/main.jsonnet input_type: jsonnet diff --git a/component/app.jsonnet b/component/app.jsonnet index a9628b8..bcdb42e 100644 --- a/component/app.jsonnet +++ b/component/app.jsonnet @@ -2,6 +2,10 @@ local argocd = import 'lib/argocd.libjsonnet'; local app = argocd.App('storageclass', 'syn', secrets=false); +local appPath = + local project = std.get(std.get(app, 'spec', {}), 'project', 'syn'); + if project == 'syn' then 'apps' else 'apps-%s' % project; + { - storageclass: app, + ['%s/storageclass' % appPath]: app, }