fix
This commit is contained in:
@@ -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", {}))
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
@@ -6,73 +6,11 @@ metadata:
|
||||
name: domain-devspaces
|
||||
description: null
|
||||
options:
|
||||
ingress_class:
|
||||
default: traefik
|
||||
app_group:
|
||||
default: dev
|
||||
examples:
|
||||
- traefik
|
||||
- dev
|
||||
type: string
|
||||
storage:
|
||||
default:
|
||||
volume:
|
||||
accessMode: ReadWriteOnce
|
||||
class: ''
|
||||
examples:
|
||||
- volume:
|
||||
accessMode: ReadWriteOnce
|
||||
class: ''
|
||||
properties:
|
||||
volume:
|
||||
default:
|
||||
accessMode: ReadWriteOnce
|
||||
class: ''
|
||||
properties:
|
||||
accessMode:
|
||||
default: ReadWriteOnce
|
||||
type: string
|
||||
class:
|
||||
default: ''
|
||||
type: string
|
||||
type: object
|
||||
type: object
|
||||
images:
|
||||
default:
|
||||
codeserver:
|
||||
pull_policy: IfNotPresent
|
||||
registry: docker.io
|
||||
repository: sebt3/code-server
|
||||
tag: 4.18
|
||||
examples:
|
||||
- codeserver:
|
||||
pull_policy: IfNotPresent
|
||||
registry: docker.io
|
||||
repository: sebt3/code-server
|
||||
tag: 4.18
|
||||
properties:
|
||||
codeserver:
|
||||
default:
|
||||
pull_policy: IfNotPresent
|
||||
registry: docker.io
|
||||
repository: sebt3/code-server
|
||||
tag: 4.18
|
||||
properties:
|
||||
pull_policy:
|
||||
default: IfNotPresent
|
||||
enum:
|
||||
- Always
|
||||
- Never
|
||||
- IfNotPresent
|
||||
type: string
|
||||
registry:
|
||||
default: docker.io
|
||||
type: string
|
||||
repository:
|
||||
default: sebt3/code-server
|
||||
type: string
|
||||
tag:
|
||||
default: 4.18
|
||||
type: number
|
||||
type: object
|
||||
type: object
|
||||
apps:
|
||||
default:
|
||||
dbgate:
|
||||
@@ -144,6 +82,46 @@ options:
|
||||
type: boolean
|
||||
type: object
|
||||
type: object
|
||||
backups:
|
||||
default:
|
||||
enable: false
|
||||
endpoint: ''
|
||||
key_id_key: s3-id
|
||||
restic_key: bck-password
|
||||
secret_key: s3-secret
|
||||
secret_name: backup-settings
|
||||
use_barman: false
|
||||
examples:
|
||||
- enable: false
|
||||
endpoint: ''
|
||||
key_id_key: s3-id
|
||||
restic_key: bck-password
|
||||
secret_key: s3-secret
|
||||
secret_name: backup-settings
|
||||
use_barman: false
|
||||
properties:
|
||||
enable:
|
||||
default: false
|
||||
type: boolean
|
||||
endpoint:
|
||||
default: ''
|
||||
type: string
|
||||
key_id_key:
|
||||
default: s3-id
|
||||
type: string
|
||||
restic_key:
|
||||
default: bck-password
|
||||
type: string
|
||||
secret_key:
|
||||
default: s3-secret
|
||||
type: string
|
||||
secret_name:
|
||||
default: backup-settings
|
||||
type: string
|
||||
use_barman:
|
||||
default: false
|
||||
type: boolean
|
||||
type: object
|
||||
distributions:
|
||||
default:
|
||||
core: core
|
||||
@@ -159,6 +137,173 @@ options:
|
||||
default: domain
|
||||
type: string
|
||||
type: object
|
||||
domain:
|
||||
default: your-company
|
||||
examples:
|
||||
- your-company
|
||||
type: string
|
||||
domain_name:
|
||||
default: your-company.com
|
||||
examples:
|
||||
- your-company.com
|
||||
type: string
|
||||
external-marias:
|
||||
default: []
|
||||
examples:
|
||||
- []
|
||||
items:
|
||||
properties:
|
||||
name:
|
||||
default: ''
|
||||
type: string
|
||||
namespace:
|
||||
default: ''
|
||||
type: string
|
||||
secret:
|
||||
properties:
|
||||
key:
|
||||
default: ''
|
||||
type: string
|
||||
name:
|
||||
default: ''
|
||||
type: string
|
||||
type: object
|
||||
username:
|
||||
default: ''
|
||||
type: string
|
||||
type: object
|
||||
type: array
|
||||
external-mongos:
|
||||
default: []
|
||||
examples:
|
||||
- []
|
||||
items:
|
||||
properties:
|
||||
dbname:
|
||||
default: ''
|
||||
type: string
|
||||
name:
|
||||
default: ''
|
||||
type: string
|
||||
namespace:
|
||||
default: ''
|
||||
type: string
|
||||
secret:
|
||||
properties:
|
||||
key:
|
||||
default: ''
|
||||
type: string
|
||||
name:
|
||||
default: ''
|
||||
type: string
|
||||
type: object
|
||||
username:
|
||||
default: ''
|
||||
type: string
|
||||
type: object
|
||||
type: array
|
||||
external-pgs:
|
||||
default: []
|
||||
examples:
|
||||
- []
|
||||
items:
|
||||
properties:
|
||||
dbname:
|
||||
default: ''
|
||||
type: string
|
||||
name:
|
||||
default: ''
|
||||
type: string
|
||||
namespace:
|
||||
default: ''
|
||||
type: string
|
||||
secret:
|
||||
properties:
|
||||
key:
|
||||
default: ''
|
||||
type: string
|
||||
name:
|
||||
default: ''
|
||||
type: string
|
||||
type: object
|
||||
username:
|
||||
default: ''
|
||||
type: string
|
||||
type: object
|
||||
type: array
|
||||
external-redis:
|
||||
default: []
|
||||
examples:
|
||||
- []
|
||||
items:
|
||||
properties:
|
||||
name:
|
||||
default: ''
|
||||
type: string
|
||||
namespace:
|
||||
default: ''
|
||||
type: string
|
||||
type: object
|
||||
type: array
|
||||
haveGitea:
|
||||
default: false
|
||||
examples:
|
||||
- false
|
||||
type: boolean
|
||||
images:
|
||||
default:
|
||||
codeserver:
|
||||
pull_policy: IfNotPresent
|
||||
registry: docker.io
|
||||
repository: sebt3/code-server
|
||||
tag: 4.18
|
||||
examples:
|
||||
- codeserver:
|
||||
pull_policy: IfNotPresent
|
||||
registry: docker.io
|
||||
repository: sebt3/code-server
|
||||
tag: 4.18
|
||||
properties:
|
||||
codeserver:
|
||||
default:
|
||||
pull_policy: IfNotPresent
|
||||
registry: docker.io
|
||||
repository: sebt3/code-server
|
||||
tag: 4.18
|
||||
properties:
|
||||
pull_policy:
|
||||
default: IfNotPresent
|
||||
enum:
|
||||
- Always
|
||||
- Never
|
||||
- IfNotPresent
|
||||
type: string
|
||||
registry:
|
||||
default: docker.io
|
||||
type: string
|
||||
repository:
|
||||
default: sebt3/code-server
|
||||
type: string
|
||||
tag:
|
||||
default: 4.18
|
||||
type: number
|
||||
type: object
|
||||
type: object
|
||||
ingress_class:
|
||||
default: traefik
|
||||
examples:
|
||||
- traefik
|
||||
type: string
|
||||
issuer:
|
||||
default: letsencrypt-prod
|
||||
examples:
|
||||
- letsencrypt-prod
|
||||
type: string
|
||||
language:
|
||||
default: fr_FR
|
||||
examples:
|
||||
- fr_FR
|
||||
type: string
|
||||
organisations:
|
||||
default: []
|
||||
examples:
|
||||
@@ -200,119 +345,11 @@ options:
|
||||
type: array
|
||||
type: object
|
||||
type: array
|
||||
external-pgs:
|
||||
default: []
|
||||
sso_vynil:
|
||||
default: true
|
||||
examples:
|
||||
- []
|
||||
items:
|
||||
properties:
|
||||
dbname:
|
||||
default: ''
|
||||
type: string
|
||||
name:
|
||||
default: ''
|
||||
type: string
|
||||
namespace:
|
||||
default: ''
|
||||
type: string
|
||||
secret:
|
||||
properties:
|
||||
key:
|
||||
default: ''
|
||||
type: string
|
||||
name:
|
||||
default: ''
|
||||
type: string
|
||||
type: object
|
||||
username:
|
||||
default: ''
|
||||
type: string
|
||||
type: object
|
||||
type: array
|
||||
timezone:
|
||||
default: Europe/Paris
|
||||
examples:
|
||||
- Europe/Paris
|
||||
type: string
|
||||
language:
|
||||
default: fr_FR
|
||||
examples:
|
||||
- fr_FR
|
||||
type: string
|
||||
domain_name:
|
||||
default: your-company.com
|
||||
examples:
|
||||
- your-company.com
|
||||
type: string
|
||||
backups:
|
||||
default:
|
||||
enable: false
|
||||
endpoint: ''
|
||||
key_id_key: s3-id
|
||||
restic_key: bck-password
|
||||
secret_key: s3-secret
|
||||
secret_name: backup-settings
|
||||
use_barman: false
|
||||
examples:
|
||||
- enable: false
|
||||
endpoint: ''
|
||||
key_id_key: s3-id
|
||||
restic_key: bck-password
|
||||
secret_key: s3-secret
|
||||
secret_name: backup-settings
|
||||
use_barman: false
|
||||
properties:
|
||||
enable:
|
||||
default: false
|
||||
type: boolean
|
||||
endpoint:
|
||||
default: ''
|
||||
type: string
|
||||
key_id_key:
|
||||
default: s3-id
|
||||
type: string
|
||||
restic_key:
|
||||
default: bck-password
|
||||
type: string
|
||||
secret_key:
|
||||
default: s3-secret
|
||||
type: string
|
||||
secret_name:
|
||||
default: backup-settings
|
||||
type: string
|
||||
use_barman:
|
||||
default: false
|
||||
type: boolean
|
||||
type: object
|
||||
external-mongos:
|
||||
default: []
|
||||
examples:
|
||||
- []
|
||||
items:
|
||||
properties:
|
||||
dbname:
|
||||
default: ''
|
||||
type: string
|
||||
name:
|
||||
default: ''
|
||||
type: string
|
||||
namespace:
|
||||
default: ''
|
||||
type: string
|
||||
secret:
|
||||
properties:
|
||||
key:
|
||||
default: ''
|
||||
type: string
|
||||
name:
|
||||
default: ''
|
||||
type: string
|
||||
type: object
|
||||
username:
|
||||
default: ''
|
||||
type: string
|
||||
type: object
|
||||
type: array
|
||||
- true
|
||||
type: boolean
|
||||
stations:
|
||||
default: []
|
||||
examples:
|
||||
@@ -329,75 +366,38 @@ options:
|
||||
type: array
|
||||
type: object
|
||||
type: array
|
||||
external-redis:
|
||||
default: []
|
||||
examples:
|
||||
- []
|
||||
items:
|
||||
properties:
|
||||
name:
|
||||
default: ''
|
||||
type: string
|
||||
namespace:
|
||||
default: ''
|
||||
type: string
|
||||
type: object
|
||||
type: array
|
||||
issuer:
|
||||
default: letsencrypt-prod
|
||||
examples:
|
||||
- letsencrypt-prod
|
||||
type: string
|
||||
haveGitea:
|
||||
default: false
|
||||
examples:
|
||||
- false
|
||||
type: boolean
|
||||
domain:
|
||||
default: your-company
|
||||
examples:
|
||||
- your-company
|
||||
type: string
|
||||
stations-sub_domain:
|
||||
default: code
|
||||
examples:
|
||||
- code
|
||||
type: string
|
||||
sso_vynil:
|
||||
default: true
|
||||
storage:
|
||||
default:
|
||||
volume:
|
||||
accessMode: ReadWriteOnce
|
||||
class: ''
|
||||
examples:
|
||||
- true
|
||||
type: boolean
|
||||
external-marias:
|
||||
default: []
|
||||
- volume:
|
||||
accessMode: ReadWriteOnce
|
||||
class: ''
|
||||
properties:
|
||||
volume:
|
||||
default:
|
||||
accessMode: ReadWriteOnce
|
||||
class: ''
|
||||
properties:
|
||||
accessMode:
|
||||
default: ReadWriteOnce
|
||||
type: string
|
||||
class:
|
||||
default: ''
|
||||
type: string
|
||||
type: object
|
||||
type: object
|
||||
timezone:
|
||||
default: Europe/Paris
|
||||
examples:
|
||||
- []
|
||||
items:
|
||||
properties:
|
||||
name:
|
||||
default: ''
|
||||
type: string
|
||||
namespace:
|
||||
default: ''
|
||||
type: string
|
||||
secret:
|
||||
properties:
|
||||
key:
|
||||
default: ''
|
||||
type: string
|
||||
name:
|
||||
default: ''
|
||||
type: string
|
||||
type: object
|
||||
username:
|
||||
default: ''
|
||||
type: string
|
||||
type: object
|
||||
type: array
|
||||
app_group:
|
||||
default: dev
|
||||
examples:
|
||||
- dev
|
||||
- Europe/Paris
|
||||
type: string
|
||||
dependencies: []
|
||||
providers:
|
||||
@@ -405,6 +405,7 @@ providers:
|
||||
authentik: null
|
||||
kubectl: true
|
||||
postgresql: null
|
||||
mysql: null
|
||||
restapi: null
|
||||
http: null
|
||||
gitea: null
|
||||
|
||||
Reference in New Issue
Block a user