From af5a72124f20d9a9d0912ef8be2dc273f378287e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Mon, 23 Oct 2023 13:09:15 +0200 Subject: [PATCH] fix --- share/dataset-pg/databases.tf | 1 + share/dataset-pg/index.yaml | 64 +++++++++++++++++------------------ 2 files changed, 33 insertions(+), 32 deletions(-) diff --git a/share/dataset-pg/databases.tf b/share/dataset-pg/databases.tf index b85915f..ccaf4d3 100644 --- a/share/dataset-pg/databases.tf +++ b/share/dataset-pg/databases.tf @@ -6,6 +6,7 @@ resource "time_sleep" "wait_pg_ready" { } data "kubernetes_secret_v1" "postgresql_password" { + depends_on = [ kubectl_manifest.prj_pg ] 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 307bc1f..435bc72 100644 --- a/share/dataset-pg/index.yaml +++ b/share/dataset-pg/index.yaml @@ -6,10 +6,10 @@ metadata: name: dataset-pg description: null options: - issuer: - default: letsencrypt-prod + domain-name: + default: your_company.com examples: - - letsencrypt-prod + - your_company.com type: string backups: default: @@ -65,35 +65,6 @@ options: default: backup-settings type: string type: object - databases: - default: [] - items: - properties: - name: - default: db - type: string - type: object - type: array - ingress-class: - default: traefik - examples: - - traefik - type: string - storage: - default: 8Gi - examples: - - 8Gi - type: string - domain-name: - default: your_company.com - examples: - - your_company.com - type: string - sub-domain: - default: dataset-pg - examples: - - dataset-pg - type: string roles: default: [] items: @@ -214,6 +185,35 @@ options: examples: - 1 type: integer + databases: + default: [] + items: + properties: + name: + default: db + type: string + type: object + type: array + sub-domain: + default: dataset-pg + examples: + - dataset-pg + type: string + storage: + default: 8Gi + examples: + - 8Gi + type: string + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string + ingress-class: + default: traefik + examples: + - traefik + type: string dependencies: - dist: null category: dbo