Skip to content

Commit b918a34

Browse files
authored
Merge pull request #11 from projectsyn/template-sync
Update from component template
2 parents 85cd7fd + b38074d commit b918a34

4 files changed

Lines changed: 9 additions & 4 deletions

File tree

.cruft.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"template": "https://github.com/projectsyn/commodore-component-template.git",
3-
"commit": "8840f87d25d97ce0d4bfed75d40173caaf4100fc",
3+
"commit": "98d16f99766e6c6d97322dbe42e058f0e2bf73d0",
44
"checkout": "main",
55
"context": {
66
"cookiecutter": {

class/cloudscale-cloud-controller-manager.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ parameters:
99
- input_paths:
1010
- ${_base_directory}/component/app.jsonnet
1111
input_type: jsonnet
12-
output_path: apps/
12+
output_path: .
1313
- input_paths:
1414
- ${_base_directory}/component/main.jsonnet
1515
input_type: jsonnet

class/defaults.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
parameters:
22
cloudscale_cloud_controller_manager:
3-
=_metadata: {}
3+
=_metadata:
4+
multi_tenant: true
45
namespace: syn-cloudscale-cloud-controller-manager
56

67
manifests_version: 1.1.0

component/app.jsonnet

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ local argocd = import 'lib/argocd.libjsonnet';
55

66
local app = argocd.App('cloudscale-cloud-controller-manager', params.namespace);
77

8+
local appPath =
9+
local project = std.get(std.get(app, 'spec', {}), 'project', 'syn');
10+
if project == 'syn' then 'apps' else 'apps-%s' % project;
11+
812
{
9-
'cloudscale-cloud-controller-manager': app,
13+
['%s/cloudscale-cloud-controller-manager' % appPath]: app,
1014
}

0 commit comments

Comments
 (0)