Skip to content

Commit

Permalink
Merge pull request #125 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 846f993 + 8267bad commit 878bd8b
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 3 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": "8840f87d25d97ce0d4bfed75d40173caaf4100fc",
"commit": "98d16f99766e6c6d97322dbe42e058f0e2bf73d0",
"checkout": "main",
"context": {
"cookiecutter": {
Expand Down
2 changes: 2 additions & 0 deletions class/defaults.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
parameters:
lieutenant:
=_metadata:
multi_tenant: true
namespace: lieutenant
images:
operator:
Expand Down
2 changes: 1 addition & 1 deletion class/lieutenant.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ parameters:
- input_paths:
- lieutenant/component/app.jsonnet
input_type: jsonnet
output_path: apps/
output_path: .
- input_paths:
- lieutenant/manifests/crd/bases/${lieutenant:operator:manifest_version}/
input_type: copy
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('lieutenant', params.namespace);

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

{
lieutenant: app,
['%s/lieutenant' % appPath]: app,
}

0 comments on commit 878bd8b

Please sign in to comment.