From 91c41f6eda8ecb594d558c71e0ca0fe24e63823f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Fri, 26 Jan 2024 14:03:58 +0100 Subject: [PATCH] fix --- share/dataset-pg/databases.tf | 2 +- share/dataset-pg/index.yaml | 226 +++++++++++++++++----------------- 2 files changed, 114 insertions(+), 114 deletions(-) diff --git a/share/dataset-pg/databases.tf b/share/dataset-pg/databases.tf index 517858b..797e7c1 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 = [ 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 51255de..bd33595 100644 --- a/share/dataset-pg/index.yaml +++ b/share/dataset-pg/index.yaml @@ -6,50 +6,69 @@ metadata: name: dataset-pg description: null options: - images: + backups: default: - postgresql: - registry: ghcr.io - repository: cloudnative-pg/postgresql - tag: 15.3 + enable: false + endpoint: '' + key-id-key: s3-id + retention: + db: 30d + schedule: + db: 0 3 * * * + secret-key: s3-secret + secret-name: backup-settings examples: - - postgresql: - registry: ghcr.io - repository: cloudnative-pg/postgresql - tag: 15.3 + - enable: false + endpoint: '' + key-id-key: s3-id + retention: + db: 30d + schedule: + db: 0 3 * * * + secret-key: s3-secret + secret-name: backup-settings properties: - postgresql: + enable: + default: false + type: boolean + endpoint: + default: '' + type: string + key-id-key: + default: s3-id + type: string + retention: default: - registry: ghcr.io - repository: cloudnative-pg/postgresql - tag: 15.3 + db: 30d properties: - registry: - default: ghcr.io + db: + default: 30d type: string - repository: - default: cloudnative-pg/postgresql - type: string - tag: - default: 15.3 - type: number 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 - ingress_class: - default: traefik - examples: - - traefik - type: string - postgres: - default: - replicas: 1 - examples: - - replicas: 1 - properties: - replicas: - default: 1 - type: integer - type: object + roles: + default: [] + items: + properties: + name: + default: alt-account + type: string + type: object + type: array storage: default: postgres: @@ -72,25 +91,34 @@ options: examples: - dataset-pg type: string - 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 - domain: - default: your-company + postgres: + default: + replicas: 1 examples: - - your-company + - replicas: 1 + properties: + replicas: + default: 1 + type: integer + type: object + databases: + default: [] + items: + properties: + name: + default: db + type: string + type: object + type: array + domain_name: + default: your_company.com + examples: + - your_company.com type: string extentions: default: @@ -273,78 +301,50 @@ options: type: object type: object type: object - databases: - default: [] - items: - properties: - name: - default: db - type: string - type: object - type: array - roles: - default: [] - items: - properties: - name: - default: alt-account - type: string - type: object - type: array - 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 + domain: + default: your-company examples: - - enable: false - endpoint: '' - key-id-key: s3-id - retention: - db: 30d - schedule: - db: 0 3 * * * - secret-key: s3-secret - secret-name: backup-settings + - your-company + 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: - enable: - default: false - type: boolean - endpoint: - default: '' - type: string - key-id-key: - default: s3-id - type: string - retention: + postgresql: default: - db: 30d + registry: ghcr.io + repository: cloudnative-pg/postgresql + tag: 15.3 properties: - db: - default: 30d + registry: + default: ghcr.io type: string - type: object - schedule: - default: - db: 0 3 * * * - properties: - db: - default: 0 3 * * * + repository: + default: cloudnative-pg/postgresql type: string + tag: + default: 15.3 + type: number type: object - secret-key: - default: s3-secret - type: string - secret-name: - default: backup-settings - type: string type: object + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string + ingress_class: + default: traefik + examples: + - traefik + type: string dependencies: - dist: null category: dbo