From eca9c260159bb85b8b3d903084dd5baa7d7e1384 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Sat, 6 Apr 2024 14:17:19 +0200 Subject: [PATCH] fix --- share/dataset-pg/databases.tf | 2 +- share/dataset-pg/index.yaml | 248 +++++++++++++++++----------------- 2 files changed, 125 insertions(+), 125 deletions(-) diff --git a/share/dataset-pg/databases.tf b/share/dataset-pg/databases.tf index e034b45..b443e9f 100644 --- a/share/dataset-pg/databases.tf +++ b/share/dataset-pg/databases.tf @@ -6,7 +6,7 @@ resource "time_sleep" "wait_pg_ready" { } data "kubernetes_secret_v1" "postgresql_password" { - depends_on = [ time_sleep.wait_pg_ready, kubectl_manifest.prj_pg ] + depends_on = [ time_sleep.wait_pg_ready ] metadata { name = "${var.instance}-${var.component}-superuser" namespace = "${var.namespace}" diff --git a/share/dataset-pg/index.yaml b/share/dataset-pg/index.yaml index 2f704b9..e25a365 100644 --- a/share/dataset-pg/index.yaml +++ b/share/dataset-pg/index.yaml @@ -6,114 +6,6 @@ metadata: name: dataset-pg description: null options: - backups: - default: - enable: false - endpoint: '' - key_id_key: s3-id - retention: - db: 30d - schedule: - db: 0 3 * * * - secret_key: s3-secret - secret_name: backup-settings - examples: - - enable: false - endpoint: '' - key_id_key: s3-id - retention: - db: 30d - schedule: - db: 0 3 * * * - secret_key: s3-secret - secret_name: backup-settings - properties: - enable: - default: false - type: boolean - endpoint: - default: '' - type: string - key_id_key: - default: s3-id - type: string - retention: - default: - db: 30d - properties: - db: - default: 30d - type: string - type: object - schedule: - default: - db: 0 3 * * * - properties: - db: - default: 0 3 * * * - type: string - type: object - secret_key: - default: s3-secret - type: string - secret_name: - default: backup-settings - type: string - type: object - 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 - domain_name: - default: your_company.com - examples: - - your_company.com - type: string - ingress_class: - default: traefik - examples: - - traefik - type: string - postgres: - default: - replicas: 1 - examples: - - replicas: 1 - properties: - replicas: - default: 1 - type: integer - type: object sub_domain: default: dataset-pg examples: @@ -300,11 +192,65 @@ options: type: object type: object type: object - domain: - default: your-company + issuer: + default: letsencrypt-prod examples: - - your-company + - letsencrypt-prod type: string + backups: + default: + enable: false + endpoint: '' + key_id_key: s3-id + retention: + db: 30d + schedule: + db: 0 3 * * * + secret_key: s3-secret + secret_name: backup-settings + examples: + - enable: false + endpoint: '' + key_id_key: s3-id + retention: + db: 30d + schedule: + db: 0 3 * * * + secret_key: s3-secret + secret_name: backup-settings + properties: + enable: + default: false + type: boolean + endpoint: + default: '' + type: string + key_id_key: + default: s3-id + type: string + retention: + default: + db: 30d + properties: + db: + default: 30d + type: string + type: object + schedule: + default: + db: 0 3 * * * + properties: + db: + default: 0 3 * * * + type: string + type: object + secret_key: + default: s3-secret + type: string + secret_name: + default: backup-settings + type: string + type: object databases: default: [] items: @@ -314,20 +260,35 @@ options: type: string type: object type: array - roles: - default: [] - items: - properties: - name: - default: alt-account - type: string - type: object - type: array - app_group: - default: api + images: + default: + postgresql: + registry: ghcr.io + repository: cloudnative-pg/postgresql + tag: 15.3 examples: - - api - type: string + - 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 storage: default: postgres: @@ -345,6 +306,45 @@ options: type: string type: object type: object + domain_name: + default: your_company.com + examples: + - your_company.com + type: string + roles: + default: [] + items: + properties: + name: + default: alt-account + type: string + type: object + type: array + app_group: + default: api + examples: + - api + type: string + domain: + default: your-company + examples: + - your-company + type: string + postgres: + default: + replicas: 1 + examples: + - replicas: 1 + properties: + replicas: + default: 1 + type: integer + type: object + ingress_class: + default: traefik + examples: + - traefik + type: string dependencies: - dist: null category: dbo