Skip to content

Commit f899c06

Browse files
committed
Update from component template
Template version: main (`98d16f9`)
1 parent a27725b commit f899c06

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

.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/defaults.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ parameters:
22
fluentbit:
33
=_metadata:
44
multi_instance: true
5+
multi_tenant: true
56

67
namespace: syn-fluentbit
78
createNamespace: true

class/fluentbit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ parameters:
1010
- input_paths:
1111
- fluentbit/component/app.jsonnet
1212
input_type: jsonnet
13-
output_path: apps/
13+
output_path: .
1414
- input_paths:
1515
- fluentbit/component/main.jsonnet
1616
input_type: jsonnet

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(inv.parameters._instance, 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-
[inv.parameters._instance]: app,
13+
['%s/%s' % [ appPath, inv.parameters._instance ]]: app,
1014
}

0 commit comments

Comments
 (0)