vynil/domain
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Sébastien Huss
2024-04-11 10:59:56 +02:00
parent 0ad9715154
commit c25e5e7718
18 changed files with 1116 additions and 1095 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
meta/domain-devspaces/apps.tf
View File

@@ -59,9 +59,9 @@ locals {
])
)
}, { for k, v in var.apps.okd : k => v if !contains(["enable","storage","backups"],k) },{
backups = merge(lookup(var.apps.okd, "backups", {}), local.global-backups)
backups = merge(local.global-backups, lookup(var.apps.okd, "backups", {}))
storage = merge({ for k, v in lookup(var.apps.okd, "storage", {}) : k => v if !contains(["volume"],k) }, {
volume = merge(lookup(lookup(var.apps.okd, "storage", {}), "volume", {}), local.global-volume)
volume = merge(local.global-volume, lookup(lookup(var.apps.okd, "storage", {}), "volume", {}))
})
})
gramo = merge(local.global-apps, {
@@ -74,12 +74,21 @@ locals {
])
)
}, { for k, v in var.apps.gramo : k => v if !contains(["enable","storage","backups"],k) },{
backups = merge(lookup(var.apps.gramo, "backups", {}), local.global-backups)
backups = merge(local.global-backups, lookup(var.apps.gramo, "backups", {}))
storage = merge({ for k, v in lookup(var.apps.gramo, "storage", {}) : k => v if !contains(["volume"],k) }, {
volume = merge(lookup(lookup(var.apps.gramo, "storage", {}), "volume", {}), local.global-volume)
volume = merge(local.global-volume, lookup(lookup(var.apps.gramo, "storage", {}), "volume", {}))
})
})
dbgate = merge(local.global-apps, {
"namespaces" = concat([
for station in local.sorted-station-names: "${var.domain}-devspaces-${station}"
],flatten([
for org in local.sorted-organisations:[
for stage in reverse(distinct(sort([for s in lookup(org, "stages", []): s.name]))): "${var.domain}-org-${org.name}-${stage}"
]
])
)
}, {
"pg" = concat(
flatten([for ds in local.sorted-datasets: [for db in lookup(ds, "databases", []): {
"name" = "${ds.name}-dataset-pg"
@@ -181,9 +190,9 @@ locals {
var.external-redis
)
}, { for k, v in var.apps.dbgate : k => v if !contains(["enable","storage","backups"],k) },{
backups = merge(lookup(var.apps.dbgate, "backups", {}), local.global-backups)
backups = merge(local.global-backups, lookup(var.apps.dbgate, "backups", {}))
storage = merge({ for k, v in lookup(var.apps.dbgate, "storage", {}) : k => v if !contains(["volume"],k) }, {
volume = merge(lookup(lookup(var.apps.dbgate, "storage", {}), "volume", {}), local.global-volume)
volume = merge(local.global-volume, lookup(lookup(var.apps.dbgate, "storage", {}), "volume", {}))
})
})
}