diff --git a/.cruft.json b/.cruft.json index b6b5caa..df541f2 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/cloudscale-cloud-controller-manager.yml b/class/cloudscale-cloud-controller-manager.yml index c0bdb6e..73ccf0d 100644 --- a/class/cloudscale-cloud-controller-manager.yml +++ b/class/cloudscale-cloud-controller-manager.yml @@ -9,7 +9,7 @@ parameters: - input_paths: - ${_base_directory}/component/app.jsonnet input_type: jsonnet - output_path: apps/ + output_path: . - input_paths: - ${_base_directory}/component/main.jsonnet input_type: jsonnet diff --git a/class/defaults.yml b/class/defaults.yml index e39663f..f17b9e1 100644 --- a/class/defaults.yml +++ b/class/defaults.yml @@ -1,6 +1,7 @@ parameters: cloudscale_cloud_controller_manager: - =_metadata: {} + =_metadata: + multi_tenant: true namespace: syn-cloudscale-cloud-controller-manager manifests_version: 1.1.0 diff --git a/component/app.jsonnet b/component/app.jsonnet index 429986a..01bf9f0 100644 --- a/component/app.jsonnet +++ b/component/app.jsonnet @@ -5,6 +5,10 @@ local argocd = import 'lib/argocd.libjsonnet'; local app = argocd.App('cloudscale-cloud-controller-manager', params.namespace); +local appPath = + local project = std.get(std.get(app, 'spec', {}), 'project', 'syn'); + if project == 'syn' then 'apps' else 'apps-%s' % project; + { - 'cloudscale-cloud-controller-manager': app, + ['%s/cloudscale-cloud-controller-manager' % appPath]: app, }