Merge pull request #154 from projectsyn/template-sync

simu · web-flow · commit 6f4ac8683fc4 · 2025-01-13T11:24:20.000+01:00
Update from component template
diff --git a/.cruft.json b/.cruft.json
@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/projectsyn/commodore-component-template.git",
-  "commit": "f12cbb49f928cf689cf39b98d8d7c9e88fb289f6",
+  "commit": "98d16f99766e6c6d97322dbe42e058f0e2bf73d0",
   "checkout": "main",
   "context": {
     "cookiecutter": {
diff --git a/component/app.jsonnet b/component/app.jsonnet
@@ -7,7 +7,7 @@ local argocd = import 'lib/argocd.libjsonnet';
 local app = argocd.App('backup-k8up', params.namespace);
 
 local appPath =
-  local project = std.get(app, 'spec', { project: 'syn' }).project;
+  local project = std.get(std.get(app, 'spec', {}), 'project', 'syn');
   if project == 'syn' then 'apps' else 'apps-%s' % project;
 
 {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"template": "https://github.com/projectsyn/commodore-component-template.git",`
`3`		`- "commit": "f12cbb49f928cf689cf39b98d8d7c9e88fb289f6",`
	`3`	`+ "commit": "98d16f99766e6c6d97322dbe42e058f0e2bf73d0",`
`4`	`4`	`"checkout": "main",`
`5`	`5`	`"context": {`
`6`	`6`	`"cookiecutter": {`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ local argocd = import 'lib/argocd.libjsonnet';`
`7`	`7`	`local app = argocd.App('backup-k8up', params.namespace);`
`8`	`8`
`9`	`9`	`local appPath =`
`10`		`- local project = std.get(app, 'spec', { project: 'syn' }).project;`
	`10`	`+ local project = std.get(std.get(app, 'spec', {}), 'project', 'syn');`
`11`	`11`	`if project == 'syn' then 'apps' else 'apps-%s' % project;`
`12`	`12`
`13`	`13`	`{`