Skip to content

Commit

Permalink
Merge pull request #207 from projectsyn/template-sync
Browse files Browse the repository at this point in the history
Update from component template
  • Loading branch information
simu authored Jan 7, 2025
2 parents 93134f6 + a378f21 commit 8e30371
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .cruft.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"template": "https://github.com/projectsyn/commodore-component-template.git",
"commit": "ba0ed2c8ff147199a748e9ff12cadce32c167fc0",
"commit": "98d16f99766e6c6d97322dbe42e058f0e2bf73d0",
"checkout": "main",
"context": {
"cookiecutter": {
Expand Down
3 changes: 2 additions & 1 deletion class/defaults.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
parameters:
rook_ceph:
=_metadata: {}
=_metadata:
multi_tenant: true
namespace: syn-rook-ceph-operator

ceph_cluster:
Expand Down
2 changes: 1 addition & 1 deletion class/rook-ceph.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ parameters:
- input_paths:
- rook-ceph/component/app.jsonnet
input_type: jsonnet
output_path: apps/
output_path: .
- input_paths:
- rook-ceph/helmcharts/rook-ceph/${rook_ceph:charts:rook-ceph}
input_type: helm
Expand Down
6 changes: 5 additions & 1 deletion component/app.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ local argocd = import 'lib/argocd.libjsonnet';

local app = argocd.App('rook-ceph', params.namespace);

local appPath =
local project = std.get(std.get(app, 'spec', {}), 'project', 'syn');
if project == 'syn' then 'apps' else 'apps-%s' % project;

{
'rook-ceph': app,
['%s/rook-ceph' % appPath]: app,
}

0 comments on commit 8e30371

Please sign in to comment.