Skip to content

Commit 29948d2

Browse files
authored
Merge pull request #75 from appuio/template-sync
Update from template
2 parents 6616ad3 + cb933dd commit 29948d2

File tree

4 files changed

+10
-3
lines changed

4 files changed

+10
-3
lines changed

.cruft.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"template": "https://github.com/projectsyn/commodore-component-template.git",
3-
"commit": "8840f87d25d97ce0d4bfed75d40173caaf4100fc",
3+
"commit": "f12cbb49f928cf689cf39b98d8d7c9e88fb289f6",
44
"checkout": "main",
55
"context": {
66
"cookiecutter": {

class/defaults.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
parameters:
22
openshift4_console:
3+
=_metadata:
4+
multi_tenant: true
5+
36
images:
47
oc:
58
registry: quay.io

class/openshift4-console.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ parameters:
44
- input_paths:
55
- openshift4-console/component/app.jsonnet
66
input_type: jsonnet
7-
output_path: apps/
7+
output_path: .
88
- input_paths:
99
- openshift4-console/component/main.jsonnet
1010
input_type: jsonnet

component/app.jsonnet

+5-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ local argocd = import 'lib/argocd.libjsonnet';
55

66
local app = argocd.App('openshift4-console', params.namespace, secrets=false);
77

8+
local appPath =
9+
local project = std.get(app, 'spec', { project: 'syn' }).project;
10+
if project == 'syn' then 'apps' else 'apps-%s' % project;
11+
812
{
9-
'openshift4-console': app,
13+
['%s/openshift4-console' % appPath]: app,
1014
}

0 commit comments

Comments
 (0)