From ebbf704f853368dfac0c9b2b66c1d33d4961be2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Fri, 26 Jan 2024 12:56:06 +0100 Subject: [PATCH] fix --- apps/code-server/index.yaml | 142 +++++----- apps/code-server/presentation.tf | 4 +- apps/dbgate/index.yaml | 176 ++++++------ apps/dbgate/presentation.tf | 4 +- apps/gitea/index.yaml | 354 ++++++++++++------------ apps/gitea/presentation.tf | 13 - apps/nextcloud/index.yaml | 444 +++++++++++++++---------------- apps/nextcloud/presentation.tf | 8 +- apps/okd/index.yaml | 66 ++--- apps/okd/presentation.tf | 4 +- share/dataset-pg/directus.tf | 4 +- share/dataset-pg/index.yaml | 208 +++++++-------- share/dataset-pg/postgrest.tf | 8 +- 13 files changed, 711 insertions(+), 724 deletions(-) diff --git a/apps/code-server/index.yaml b/apps/code-server/index.yaml index 170448e..860ec74 100644 --- a/apps/code-server/index.yaml +++ b/apps/code-server/index.yaml @@ -6,6 +6,36 @@ metadata: name: code-server description: null options: + sub-domain: + default: code + examples: + - code + type: string + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string + timezone: + default: Europe/Paris + examples: + - Europe/Paris + type: string + ingress_class: + default: traefik + examples: + - traefik + type: string + no-editor: + default: false + examples: + - false + type: boolean + domain: + default: your-company + examples: + - your-company + type: string admin: default: cluster: false @@ -21,53 +51,6 @@ options: default: false type: boolean type: object - domain_name: - default: your-company.com - examples: - - your-company.com - type: string - ingress_class: - default: traefik - examples: - - traefik - type: string - storage: - default: - volume: - accessMode: ReadWriteOnce - size: 20Gi - type: Filesystem - description: Configure this app storage - examples: - - volume: - accessMode: ReadWriteOnce - size: 20Gi - type: Filesystem - properties: - volume: - default: - accessMode: ReadWriteOnce - size: 20Gi - type: Filesystem - properties: - accessMode: - default: ReadWriteOnce - enum: - - ReadWriteOnce - - ReadOnlyMany - - ReadWriteMany - type: string - size: - default: 20Gi - type: string - type: - default: Filesystem - enum: - - Filesystem - - Block - type: string - type: object - type: object images: default: codeserver: @@ -107,36 +90,53 @@ options: type: number type: object type: object + domain_name: + default: your-company.com + examples: + - your-company.com + type: string app_group: default: dev examples: - dev type: string - sub-domain: - default: code + storage: + default: + volume: + accessMode: ReadWriteOnce + size: 20Gi + type: Filesystem + description: Configure this app storage examples: - - code - type: string - timezone: - default: Europe/Paris - examples: - - Europe/Paris - type: string - no-editor: - default: false - examples: - - false - type: boolean - domain: - default: your-company - examples: - - your-company - type: string - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string + - volume: + accessMode: ReadWriteOnce + size: 20Gi + type: Filesystem + properties: + volume: + default: + accessMode: ReadWriteOnce + size: 20Gi + type: Filesystem + properties: + accessMode: + default: ReadWriteOnce + enum: + - ReadWriteOnce + - ReadOnlyMany + - ReadWriteMany + type: string + size: + default: 20Gi + type: string + type: + default: Filesystem + enum: + - Filesystem + - Block + type: string + type: object + type: object dependencies: - dist: null category: share diff --git a/apps/code-server/presentation.tf b/apps/code-server/presentation.tf index 84c24da..251f4a6 100644 --- a/apps/code-server/presentation.tf +++ b/apps/code-server/presentation.tf @@ -21,8 +21,8 @@ module "service" { instance = var.instance namespace = var.namespace labels = local.common-labels - target = "http" - port = local.service.port.number + targets = ["http"] + ports = [local.service.port.number] providers = { kubectl = kubectl } diff --git a/apps/dbgate/index.yaml b/apps/dbgate/index.yaml index 755b8e4..156b49e 100644 --- a/apps/dbgate/index.yaml +++ b/apps/dbgate/index.yaml @@ -6,11 +6,74 @@ metadata: name: dbgate description: null options: - app_group: - default: dev + sub-domain: + default: dbgate examples: - - dev + - dbgate type: string + ingress_class: + default: traefik + examples: + - traefik + type: string + pg: + 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 + maria: + 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 images: default: dbgate: @@ -50,6 +113,20 @@ options: type: string type: object type: object + redis: + default: [] + examples: + - [] + items: + properties: + name: + default: '' + type: string + namespace: + default: '' + type: string + type: object + type: array storage: default: volume: @@ -92,93 +169,11 @@ options: examples: - letsencrypt-prod type: string - pg: - 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 - ingress_class: - default: traefik - examples: - - traefik - type: string - maria: - 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 domain_name: default: your_company.com examples: - your_company.com type: string - domain: - default: your-company - examples: - - your-company - type: string - redis: - default: [] - examples: - - [] - items: - properties: - name: - default: '' - type: string - namespace: - default: '' - type: string - type: object - type: array mongo: default: [] examples: @@ -208,10 +203,15 @@ options: type: string type: object type: array - sub-domain: - default: dbgate + app_group: + default: dev examples: - - dbgate + - dev + type: string + domain: + default: your-company + examples: + - your-company type: string dependencies: - dist: null diff --git a/apps/dbgate/presentation.tf b/apps/dbgate/presentation.tf index 95a8b1f..445c324 100644 --- a/apps/dbgate/presentation.tf +++ b/apps/dbgate/presentation.tf @@ -21,8 +21,8 @@ module "service" { instance = var.instance namespace = var.namespace labels = local.common-labels - target = "http" - port = local.service.port.number + targets = ["http"] + ports = [local.service.port.number] providers = { kubectl = kubectl } diff --git a/apps/gitea/index.yaml b/apps/gitea/index.yaml index 030bf12..a491ba2 100644 --- a/apps/gitea/index.yaml +++ b/apps/gitea/index.yaml @@ -9,11 +9,122 @@ metadata: A painless self-hosted Git service. Gitea is a community managed lightweight code hosting solution written in Go. It is published under the MIT license. options: - default-branch: - default: main + ingress_class: + default: traefik examples: - - main + - traefik 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 + retention: + db: 30d + keepDaily: 14 + keepMonthly: 12 + keepWeekly: 6 + keepYearly: 12 + schedule: + backup: 10 3 * * * + check: 10 5 * * 1 + db: 10 3 * * * + prune: 10 1 * * 0 + secret-key: s3-secret + secret-name: backup-settings + use-barman: false + examples: + - enable: false + endpoint: '' + key-id-key: s3-id + restic-key: bck-password + retention: + db: 30d + keepDaily: 14 + keepMonthly: 12 + keepWeekly: 6 + keepYearly: 12 + schedule: + backup: 10 3 * * * + check: 10 5 * * 1 + db: 10 3 * * * + prune: 10 1 * * 0 + 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 + retention: + default: + db: 30d + keepDaily: 14 + keepMonthly: 12 + keepWeekly: 6 + keepYearly: 12 + properties: + db: + default: 30d + type: string + keepDaily: + default: 14 + type: integer + keepMonthly: + default: 12 + type: integer + keepWeekly: + default: 6 + type: integer + keepYearly: + default: 12 + type: integer + type: object + schedule: + default: + backup: 10 3 * * * + check: 10 5 * * 1 + db: 10 3 * * * + prune: 10 1 * * 0 + properties: + backup: + default: 10 3 * * * + type: string + check: + default: 10 5 * * 1 + type: string + db: + default: 10 3 * * * + type: string + prune: + default: 10 1 * * 0 + type: string + type: object + secret-key: + default: s3-secret + type: string + secret-name: + default: backup-settings + type: string + use-barman: + default: false + type: boolean + type: object push-create: default: org: 'true' @@ -34,6 +145,11 @@ options: default: 'true' type: string type: object + replicas: + default: 1 + examples: + - 1 + type: integer admin: default: email: git-admin@git.your_company.com @@ -49,36 +165,16 @@ options: default: gitea_admin type: string type: object - ssh-sub-domain: - default: git - examples: - - git - type: string - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string - load-balancer: + postgres: default: - ip: '' + replicas: 1 examples: - - ip: '' + - replicas: 1 properties: - ip: - default: '' - type: string + replicas: + default: 1 + type: integer type: object - ssh-port: - default: 2222 - examples: - - 2222 - type: integer - theme: - default: gitea-modern - examples: - - gitea-modern - type: string storage: default: postgres: @@ -140,11 +236,6 @@ options: type: string type: object type: object - domain: - default: your-company - examples: - - your-company - type: string images: default: gitea: @@ -276,122 +367,51 @@ options: type: string type: object type: object - ingress_class: - default: traefik - examples: - - traefik - type: string app_group: default: dev examples: - dev type: string - backups: - default: - enable: false - endpoint: '' - key-id-key: s3-id - restic-key: bck-password - retention: - db: 30d - keepDaily: 14 - keepMonthly: 12 - keepWeekly: 6 - keepYearly: 12 - schedule: - backup: 10 3 * * * - check: 10 5 * * 1 - db: 10 3 * * * - prune: 10 1 * * 0 - secret-key: s3-secret - secret-name: backup-settings - use-barman: false + disable-registration: + default: true examples: - - enable: false - endpoint: '' - key-id-key: s3-id - restic-key: bck-password - retention: - db: 30d - keepDaily: 14 - keepMonthly: 12 - keepWeekly: 6 - keepYearly: 12 - schedule: - backup: 10 3 * * * - check: 10 5 * * 1 - db: 10 3 * * * - prune: 10 1 * * 0 - 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 - retention: - default: - db: 30d - keepDaily: 14 - keepMonthly: 12 - keepWeekly: 6 - keepYearly: 12 - properties: - db: - default: 30d - type: string - keepDaily: - default: 14 - type: integer - keepMonthly: - default: 12 - type: integer - keepWeekly: - default: 6 - type: integer - keepYearly: - default: 12 - type: integer - type: object - schedule: - default: - backup: 10 3 * * * - check: 10 5 * * 1 - db: 10 3 * * * - prune: 10 1 * * 0 - properties: - backup: - default: 10 3 * * * - type: string - check: - default: 10 5 * * 1 - type: string - db: - default: 10 3 * * * - type: string - prune: - default: 10 1 * * 0 - type: string - type: object - secret-key: - default: s3-secret - type: string - secret-name: - default: backup-settings - type: string - use-barman: - default: false - type: boolean - type: object + - true + type: boolean + default-branch: + default: main + examples: + - main + type: string + sub-domain: + default: git + examples: + - git + type: string + domain: + default: your-company + examples: + - your-company + type: string + theme: + default: gitea-modern + examples: + - gitea-modern + type: string + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string + ssh-port: + default: 2222 + examples: + - 2222 + type: integer + timezone: + default: Europe/Paris + examples: + - Europe/Paris + type: string webhook: default: allowed-hosts: private @@ -407,36 +427,11 @@ options: default: false type: boolean type: object - disable-registration: - default: true - examples: - - true - type: boolean - release: - default: 8.3.0 - examples: - - 8.3.0 - type: string - postgres: - default: - replicas: 1 - examples: - - replicas: 1 - properties: - replicas: - default: 1 - type: integer - type: object - sub-domain: + ssh-sub-domain: default: git examples: - git type: string - replicas: - default: 1 - examples: - - 1 - type: integer redis: default: exporter: @@ -454,16 +449,21 @@ options: type: boolean type: object type: object - domain_name: - default: your_company.com + release: + default: 8.3.0 examples: - - your_company.com + - 8.3.0 type: string - timezone: - default: Europe/Paris + load-balancer: + default: + ip: '' examples: - - Europe/Paris - type: string + - ip: '' + properties: + ip: + default: '' + type: string + type: object dependencies: - dist: null category: share diff --git a/apps/gitea/presentation.tf b/apps/gitea/presentation.tf index f4756f0..0c7ee6f 100644 --- a/apps/gitea/presentation.tf +++ b/apps/gitea/presentation.tf @@ -15,19 +15,6 @@ locals { } } -# module "service" { -# source = "/dist/modules/service" -# component = var.component -# instance = var.instance -# namespace = var.namespace -# labels = local.common-labels -# target = "http" -# port = local.service.port.number -# providers = { -# kubectl = kubectl -# } -# } - module "ingress" { source = "git::https://git.solidite.fr/vynil/kydah-modules.git//ingress" component = "" diff --git a/apps/nextcloud/index.yaml b/apps/nextcloud/index.yaml index 072afaf..dfdf6f7 100644 --- a/apps/nextcloud/index.yaml +++ b/apps/nextcloud/index.yaml @@ -6,225 +6,11 @@ metadata: name: nextcloud description: null options: - backups: - default: - enable: false - endpoint: '' - key-id-key: s3-id - restic-key: bck-password - retention: - db: 30d - keepDaily: 14 - keepMonthly: 12 - keepWeekly: 6 - keepYearly: 12 - schedule: - backup: 30 3 * * * - check: 30 5 * * 1 - db: 30 3 * * * - prune: 30 1 * * 0 - secret-key: s3-secret - secret-name: backup-settings - use-barman: false - examples: - - enable: false - endpoint: '' - key-id-key: s3-id - restic-key: bck-password - retention: - db: 30d - keepDaily: 14 - keepMonthly: 12 - keepWeekly: 6 - keepYearly: 12 - schedule: - backup: 30 3 * * * - check: 30 5 * * 1 - db: 30 3 * * * - prune: 30 1 * * 0 - 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 - retention: - default: - db: 30d - keepDaily: 14 - keepMonthly: 12 - keepWeekly: 6 - keepYearly: 12 - properties: - db: - default: 30d - type: string - keepDaily: - default: 14 - type: integer - keepMonthly: - default: 12 - type: integer - keepWeekly: - default: 6 - type: integer - keepYearly: - default: 12 - type: integer - type: object - schedule: - default: - backup: 30 3 * * * - check: 30 5 * * 1 - db: 30 3 * * * - prune: 30 1 * * 0 - properties: - backup: - default: 30 3 * * * - type: string - check: - default: 30 5 * * 1 - type: string - db: - default: 30 3 * * * - type: string - prune: - default: 30 1 * * 0 - type: string - type: object - secret-key: - default: s3-secret - type: string - secret-name: - default: backup-settings - type: string - use-barman: - default: false - type: boolean - type: object - domain_name: - default: your_company.com - examples: - - your_company.com - type: string - openid-name: - default: vynil - examples: - - vynil - type: string - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string - postgres: - default: - replicas: 1 - examples: - - replicas: 1 - properties: - replicas: - default: 1 - type: integer - type: object - storage: - default: - postgres: - size: 5Gi - redis: - size: 2Gi - volume: - accessMode: ReadWriteOnce - size: 10Gi - type: Filesystem - description: Configure this app storage - examples: - - postgres: - size: 5Gi - redis: - size: 2Gi - volume: - accessMode: ReadWriteOnce - size: 10Gi - type: Filesystem - properties: - postgres: - default: - size: 5Gi - properties: - size: - default: 5Gi - type: string - type: object - redis: - default: - size: 2Gi - properties: - size: - default: 2Gi - type: string - type: object - volume: - default: - accessMode: ReadWriteOnce - size: 10Gi - type: Filesystem - properties: - accessMode: - default: ReadWriteOnce - enum: - - ReadWriteOnce - - ReadOnlyMany - - ReadWriteMany - type: string - size: - default: 10Gi - type: string - type: - default: Filesystem - enum: - - Filesystem - - Block - type: string - type: object - type: object sub-domain: default: files examples: - files type: string - redis: - default: - exporter: - enabled: true - examples: - - exporter: - enabled: true - properties: - exporter: - default: - enabled: true - properties: - enabled: - default: true - type: boolean - type: object - type: object - domain: - default: your-company - examples: - - your-company - type: string images: default: collabora: @@ -570,11 +356,104 @@ options: default: true type: boolean type: object - app_group: - default: '' + ingress_class: + default: traefik examples: - - '' + - traefik type: string + domain_name: + default: your_company.com + examples: + - your_company.com + type: string + domain: + default: your-company + examples: + - your-company + type: string + redis: + default: + exporter: + enabled: true + examples: + - exporter: + enabled: true + properties: + exporter: + default: + enabled: true + properties: + enabled: + default: true + type: boolean + type: object + type: object + openid-name: + default: vynil + examples: + - vynil + type: string + storage: + default: + postgres: + size: 5Gi + redis: + size: 2Gi + volume: + accessMode: ReadWriteOnce + size: 10Gi + type: Filesystem + description: Configure this app storage + examples: + - postgres: + size: 5Gi + redis: + size: 2Gi + volume: + accessMode: ReadWriteOnce + size: 10Gi + type: Filesystem + properties: + postgres: + default: + size: 5Gi + properties: + size: + default: 5Gi + type: string + type: object + redis: + default: + size: 2Gi + properties: + size: + default: 2Gi + type: string + type: object + volume: + default: + accessMode: ReadWriteOnce + size: 10Gi + type: Filesystem + properties: + accessMode: + default: ReadWriteOnce + enum: + - ReadWriteOnce + - ReadOnlyMany + - ReadWriteMany + type: string + size: + default: 10Gi + type: string + type: + default: Filesystem + enum: + - Filesystem + - Block + type: string + type: object + type: object hpa: default: avg-cpu: 50 @@ -595,6 +474,132 @@ options: default: 1 type: integer type: object + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string + app_group: + default: '' + examples: + - '' + type: string + backups: + default: + enable: false + endpoint: '' + key-id-key: s3-id + restic-key: bck-password + retention: + db: 30d + keepDaily: 14 + keepMonthly: 12 + keepWeekly: 6 + keepYearly: 12 + schedule: + backup: 30 3 * * * + check: 30 5 * * 1 + db: 30 3 * * * + prune: 30 1 * * 0 + secret-key: s3-secret + secret-name: backup-settings + use-barman: false + examples: + - enable: false + endpoint: '' + key-id-key: s3-id + restic-key: bck-password + retention: + db: 30d + keepDaily: 14 + keepMonthly: 12 + keepWeekly: 6 + keepYearly: 12 + schedule: + backup: 30 3 * * * + check: 30 5 * * 1 + db: 30 3 * * * + prune: 30 1 * * 0 + 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 + retention: + default: + db: 30d + keepDaily: 14 + keepMonthly: 12 + keepWeekly: 6 + keepYearly: 12 + properties: + db: + default: 30d + type: string + keepDaily: + default: 14 + type: integer + keepMonthly: + default: 12 + type: integer + keepWeekly: + default: 6 + type: integer + keepYearly: + default: 12 + type: integer + type: object + schedule: + default: + backup: 30 3 * * * + check: 30 5 * * 1 + db: 30 3 * * * + prune: 30 1 * * 0 + properties: + backup: + default: 30 3 * * * + type: string + check: + default: 30 5 * * 1 + type: string + db: + default: 30 3 * * * + type: string + prune: + default: 30 1 * * 0 + type: string + type: object + secret-key: + default: s3-secret + type: string + secret-name: + default: backup-settings + type: string + use-barman: + default: false + type: boolean + type: object + postgres: + default: + replicas: 1 + examples: + - replicas: 1 + properties: + replicas: + default: 1 + type: integer + type: object admin: default: name: nextcloud_admin @@ -605,11 +610,6 @@ options: default: nextcloud_admin type: string type: object - ingress_class: - default: traefik - examples: - - traefik - type: string dependencies: - dist: null category: share diff --git a/apps/nextcloud/presentation.tf b/apps/nextcloud/presentation.tf index 3406ce3..778c112 100644 --- a/apps/nextcloud/presentation.tf +++ b/apps/nextcloud/presentation.tf @@ -76,8 +76,8 @@ module "collabora-service" { instance = var.instance namespace = var.namespace labels = local.collabora-labels - target = "http" - port = local.collabora-service.port.number + targets = ["http"] + ports = [local.collabora-service.port.number] providers = { kubectl = kubectl } @@ -107,8 +107,8 @@ module "onlyoffice-service" { instance = var.instance namespace = var.namespace labels = local.onlyoffice-labels - target = "http" - port = local.onlyoffice-service.port.number + targets = ["http"] + ports = [local.onlyoffice-service.port.number] providers = { kubectl = kubectl } diff --git a/apps/okd/index.yaml b/apps/okd/index.yaml index 01a0331..93cfaf0 100644 --- a/apps/okd/index.yaml +++ b/apps/okd/index.yaml @@ -6,45 +6,15 @@ metadata: name: okd description: null options: - app_group: - default: infra - examples: - - infra - type: string - domain_name: - default: your_company.com - examples: - - your_company.com - type: string - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string managed: default: false examples: - false type: boolean - namespaces: - default: [] - items: - type: string - type: array - sub-domain: - default: okd + issuer: + default: letsencrypt-prod examples: - - okd - type: string - ingress_class: - default: traefik - examples: - - traefik - type: string - domain: - default: your-company - examples: - - your-company + - letsencrypt-prod type: string cluster-admin: default: false @@ -90,6 +60,36 @@ options: type: string type: object type: object + domain_name: + default: your_company.com + examples: + - your_company.com + type: string + domain: + default: your-company + examples: + - your-company + type: string + ingress_class: + default: traefik + examples: + - traefik + type: string + sub-domain: + default: okd + examples: + - okd + type: string + app_group: + default: infra + examples: + - infra + type: string + namespaces: + default: [] + items: + type: string + type: array dependencies: - dist: null category: share diff --git a/apps/okd/presentation.tf b/apps/okd/presentation.tf index 5c35eff..0479a7b 100644 --- a/apps/okd/presentation.tf +++ b/apps/okd/presentation.tf @@ -21,8 +21,8 @@ module "service" { instance = var.instance namespace = var.namespace labels = local.common-labels - target = "http" - port = local.service.port.number + targets = ["http"] + ports = [local.service.port.number] providers = { kubectl = kubectl } diff --git a/share/dataset-pg/directus.tf b/share/dataset-pg/directus.tf index e7023f2..ffeace4 100644 --- a/share/dataset-pg/directus.tf +++ b/share/dataset-pg/directus.tf @@ -202,8 +202,8 @@ module "directus-service" { instance = var.instance namespace = var.namespace labels = local.directus-labels - target = "http" - port = local.directus-service.port.number + targets = ["http"] + ports = [local.directus-service.port.number] providers = { kubectl = kubectl } diff --git a/share/dataset-pg/index.yaml b/share/dataset-pg/index.yaml index 8fc1a73..26f2b62 100644 --- a/share/dataset-pg/index.yaml +++ b/share/dataset-pg/index.yaml @@ -6,110 +6,6 @@ metadata: name: dataset-pg description: null options: - databases: - default: [] - items: - properties: - name: - default: db - type: string - type: object - type: array - postgres: - default: - replicas: 1 - examples: - - replicas: 1 - properties: - replicas: - default: 1 - type: integer - type: object - ingress_class: - default: traefik - examples: - - traefik - type: string - app_group: - default: api - examples: - - api - type: string - images: - default: - postgresql: - registry: ghcr.io - repository: cloudnative-pg/postgresql - tag: 15.3 - examples: - - postgresql: - registry: ghcr.io - repository: cloudnative-pg/postgresql - tag: 15.3 - properties: - postgresql: - default: - registry: ghcr.io - repository: cloudnative-pg/postgresql - tag: 15.3 - properties: - registry: - default: ghcr.io - type: string - repository: - default: cloudnative-pg/postgresql - type: string - tag: - default: 15.3 - type: number - type: object - type: object - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string - roles: - default: [] - items: - properties: - name: - default: alt-account - type: string - type: object - type: array - domain: - default: your-company - examples: - - your-company - type: string - sub-domain: - default: dataset-pg - examples: - - dataset-pg - type: string - storage: - default: - postgres: - size: 10Gi - examples: - - postgres: - size: 10Gi - properties: - postgres: - default: - size: 10Gi - properties: - size: - default: 10Gi - type: string - type: object - type: object - domain_name: - default: your_company.com - examples: - - your_company.com - type: string extentions: default: directus: @@ -291,6 +187,46 @@ options: type: object type: object type: object + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string + domain_name: + default: your_company.com + examples: + - your_company.com + type: string + app_group: + default: api + examples: + - api + type: string + sub-domain: + default: dataset-pg + examples: + - dataset-pg + type: string + postgres: + default: + replicas: 1 + examples: + - replicas: 1 + properties: + replicas: + default: 1 + type: integer + type: object + domain: + default: your-company + examples: + - your-company + type: string + ingress_class: + default: traefik + examples: + - traefik + type: string backups: default: enable: false @@ -345,6 +281,70 @@ options: default: backup-settings type: string type: object + databases: + default: [] + items: + properties: + name: + default: db + type: string + type: object + type: array + storage: + default: + postgres: + size: 10Gi + examples: + - postgres: + size: 10Gi + properties: + postgres: + default: + size: 10Gi + properties: + size: + default: 10Gi + type: string + type: object + type: object + roles: + default: [] + items: + properties: + name: + default: alt-account + type: string + type: object + type: array + images: + default: + postgresql: + registry: ghcr.io + repository: cloudnative-pg/postgresql + tag: 15.3 + examples: + - postgresql: + registry: ghcr.io + repository: cloudnative-pg/postgresql + tag: 15.3 + properties: + postgresql: + default: + registry: ghcr.io + repository: cloudnative-pg/postgresql + tag: 15.3 + properties: + registry: + default: ghcr.io + type: string + repository: + default: cloudnative-pg/postgresql + type: string + tag: + default: 15.3 + type: number + type: object + type: object dependencies: - dist: null category: dbo diff --git a/share/dataset-pg/postgrest.tf b/share/dataset-pg/postgrest.tf index 2c3fee2..a88dff2 100644 --- a/share/dataset-pg/postgrest.tf +++ b/share/dataset-pg/postgrest.tf @@ -138,8 +138,8 @@ module "postgrest-service" { instance = var.instance namespace = var.namespace labels = local.prest-labels - target = "http" - port = local.prest-service.port.number + targets = ["http"] + ports = [local.prest-service.port.number] providers = { kubectl = kubectl } @@ -172,8 +172,8 @@ module "swagger-service" { instance = var.instance namespace = var.namespace labels = local.prest-labels - target = "swagger" - port = local.swagger-service.port.number + targets = ["swagger"] + ports = [local.swagger-service.port.number] providers = { kubectl = kubectl }