Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
12 changes: 6 additions & 6 deletions class/paralus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ parameters:
- input_paths:
- ${_base_directory}/component/main.jsonnet
input_type: jsonnet
output_path: paralus/
output_path: ${_instance}
- input_paths:
- ${_base_directory}/helmcharts/paralus/${paralus:charts:ztka:version}
input_type: helm
output_path: paralus/10_helmchart
output_path: ${_instance}/10_helmchart
helm_values: ${paralus:helm_values}
helm_params:
name: ztka
Expand All @@ -28,14 +28,14 @@ parameters:
postprocess:
filters:
- type: jsonnet
path: paralus/10_helmchart/ztka/templates
path: ${_instance}/10_helmchart/ztka/templates
filter: postprocess/patch_paralus.jsonnet
- type: jsonnet
path: paralus/10_helmchart/ztka/templates
path: ${_instance}/10_helmchart/ztka/templates
filter: postprocess/patch_ingress.jsonnet
- type: jsonnet
path: paralus/10_helmchart/ztka/templates
path: ${_instance}/10_helmchart/ztka/templates
filter: postprocess/patch_httpproxy.jsonnet
- type: jsonnet
path: paralus/10_helmchart/ztka/charts/kratos/templates
path: ${_instance}/10_helmchart/ztka/charts/kratos/templates
filter: postprocess/patch_kratos.jsonnet
6 changes: 4 additions & 2 deletions component/app.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ local kap = import 'lib/kapitan.libjsonnet';
local inv = kap.inventory();
local params = inv.parameters.paralus;
local argocd = import 'lib/argocd.libjsonnet';
local instance = inv.parameters._instance;

local app = argocd.App('paralus', params.namespace);
local appName = if instance == 'paralus' then 'paralus' else instance;
local app = argocd.App(appName, params.namespace);

{
paralus: app,
[instance]: app,
}
2 changes: 1 addition & 1 deletion component/main.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ local namespace = kube.Namespace(params.namespace) {

local cronJob = kube.CronJob('paralus-pgdb-log-cleanup-cronjob') {
metadata+: {
namespace: inv.parameters.paralus.namespace,
namespace: params.namespace,
},
spec+: {
schedule: params.dbCronJob.schedule,
Expand Down