From 740d3c1264d09bf83171bad86499260265f39601 Mon Sep 17 00:00:00 2001 From: Simon Gerber Date: Tue, 7 Jan 2025 14:14:49 +0100 Subject: [PATCH] Update from template Template version: main (`f12cbb4`) --- .cruft.json | 2 +- class/defaults.yml | 1 + class/openshift4-monitoring.yml | 2 +- component/app.jsonnet | 6 +++++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.cruft.json b/.cruft.json index 1bea0f98..e9df045c 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/projectsyn/commodore-component-template.git", - "commit": "dc2c2fa3a08a3c439793708b742377f0fa831b7f", + "commit": "f12cbb49f928cf689cf39b98d8d7c9e88fb289f6", "checkout": "main", "context": { "cookiecutter": { diff --git a/class/defaults.yml b/class/defaults.yml index f57117fd..88872d2a 100644 --- a/class/defaults.yml +++ b/class/defaults.yml @@ -6,6 +6,7 @@ parameters: library_aliases: prom.libsonnet: openshift4-monitoring-prom.libsonnet alert-patching.libsonnet: openshift4-monitoring-alert-patching.libsonnet + multi_tenant: true namespace: openshift-monitoring manifests_version: release-4.15 # no release branches newer than 4.9 exist diff --git a/class/openshift4-monitoring.yml b/class/openshift4-monitoring.yml index 4740d5ce..5712551f 100644 --- a/class/openshift4-monitoring.yml +++ b/class/openshift4-monitoring.yml @@ -144,7 +144,7 @@ parameters: - input_paths: - openshift4-monitoring/component/app.jsonnet input_type: jsonnet - output_path: apps/ + output_path: . - input_paths: - openshift4-monitoring/component/main.jsonnet input_type: jsonnet diff --git a/component/app.jsonnet b/component/app.jsonnet index 53b2a966..fa4e4963 100644 --- a/component/app.jsonnet +++ b/component/app.jsonnet @@ -5,6 +5,10 @@ local argocd = import 'lib/argocd.libjsonnet'; local app = argocd.App('openshift4-monitoring', params.namespace); +local appPath = + local project = std.get(app, 'spec', { project: 'syn' }).project; + if project == 'syn' then 'apps' else 'apps-%s' % project; + { - 'openshift4-monitoring': app, + ['%s/openshift4-monitoring' % appPath]: app, }