Skip to content

Commit

Permalink
Merge pull request #439 from vshn/template-sync
Browse files Browse the repository at this point in the history
Update from component template
  • Loading branch information
Kidswiss authored Jan 8, 2025
2 parents e35cd56 + 70e2037 commit 16d32d6
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 6 deletions.
8 changes: 7 additions & 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": "0aba6c3dc0f4bcbe81aab1cdcc977f32b00f1cb2",
"commit": "f12cbb49f928cf689cf39b98d8d7c9e88fb289f6",
"checkout": "main",
"context": {
"cookiecutter": {
Expand All @@ -13,6 +13,12 @@
"add_golden": "y",
"add_matrix": "y",
"add_go_unit": "n",
"automerge_patch": "n",
"automerge_patch_v0": "n",
"automerge_patch_regexp_blocklist": "",
"automerge_patch_v0_regexp_allowlist": "",
"automerge_minor_regexp_allowlist": "",
"auto_release": "n",
"copyright_holder": "VSHN AG <info@vshn.ch>",
"copyright_year": "2023",
"github_owner": "vshn",
Expand Down
2 changes: 1 addition & 1 deletion class/appcat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ parameters:
- input_paths:
- ${_base_directory}/component/app.jsonnet
input_type: jsonnet
output_path: apps/
output_path: .

- input_paths:
- ${_base_directory}/component/sloth-input.jsonnet
Expand Down
3 changes: 3 additions & 0 deletions class/defaults.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
parameters:
appcat:
=_metadata:
multi_tenant: true

charts:
crossplane:
source: https://charts.crossplane.io/stable
Expand Down
6 changes: 5 additions & 1 deletion component/app.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ local app = argocd.App('appcat', '') + (
}
);

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

{
appcat: app,
['%s/appcat' % appPath]: app,
}
8 changes: 5 additions & 3 deletions renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
"ignorePaths": [
".github/**"
],
"labels": [
"dependency"
],
"separateMinorPatch": true,
"postUpgradeTasks": {
"commands": [
"make gen-golden-all"
Expand All @@ -19,7 +23,5 @@
"suppressNotifications": [
"artifactErrors"
],
"labels": [
"dependency"
]
"packageRules": []
}

0 comments on commit 16d32d6

Please sign in to comment.