Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update from component template #125

Merged
merged 1 commit into from
Jan 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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,
}
Loading