From eb183e14887c9db2fecdccd77460fbe0de3eb519 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Sat, 7 Oct 2023 22:46:41 +0200 Subject: [PATCH] fix --- share/dataset-pg/index.yaml | 47 +++++++++++++++++++--------------- share/dataset-pg/postgresql.tf | 2 +- 2 files changed, 28 insertions(+), 21 deletions(-) diff --git a/share/dataset-pg/index.yaml b/share/dataset-pg/index.yaml index d265a5f..ddf9538 100644 --- a/share/dataset-pg/index.yaml +++ b/share/dataset-pg/index.yaml @@ -6,11 +6,6 @@ metadata: name: dataset-pg description: null options: - roles: - default: [] - items: - type: string - type: array backups: default: enable: false @@ -65,26 +60,33 @@ options: default: backup-settings type: string type: object - storage: - default: 8Gi - examples: - - 8Gi - type: string - pool: + roles: + default: [] + items: + type: string + type: array + extentions: default: - enable: false + pool: + enable: false examples: - - enable: false + - pool: + enable: false properties: - enable: - default: false - type: boolean + pool: + default: + enable: false + properties: + enable: + default: false + type: boolean + type: object type: object - version: - default: '14' + replicas: + default: 1 examples: - - '14' - type: string + - 1 + type: integer databases: default: [] items: @@ -94,6 +96,11 @@ options: type: string type: object type: array + storage: + default: 8Gi + examples: + - 8Gi + type: string dependencies: [] providers: kubernetes: true diff --git a/share/dataset-pg/postgresql.tf b/share/dataset-pg/postgresql.tf index 31bd44b..2693c23 100644 --- a/share/dataset-pg/postgresql.tf +++ b/share/dataset-pg/postgresql.tf @@ -56,7 +56,7 @@ resource "kubectl_manifest" "prj_pg_backup" { } resource "kubectl_manifest" "prj_pg_pool" { - count = var.pool.enable ? 1:0 + count = var.extentions.pool.enable ? 1:0 depends_on = [kubectl_manifest.prj_pg] yaml_body = <<-EOF apiVersion: postgresql.cnpg.io/v1