From 9a7091fab65a78acf5271b3da5d059d550eb4f6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Mon, 23 Oct 2023 17:42:44 +0200 Subject: [PATCH] fix --- share/dataset-pg/directus.tf | 1 + share/dataset-pg/index.yaml | 172 +++++++++++++++++------------------ 2 files changed, 87 insertions(+), 86 deletions(-) diff --git a/share/dataset-pg/directus.tf b/share/dataset-pg/directus.tf index a0c101e..87675bf 100644 --- a/share/dataset-pg/directus.tf +++ b/share/dataset-pg/directus.tf @@ -48,6 +48,7 @@ resource "kubectl_manifest" "directus_config" { AUTH_VYNIL_DRIVER: "oauth2" AUTH_VYNIL_ISSUER_URL: "https://${data.kubernetes_ingress_v1.authentik.spec[0].rule[0].host}/application/o/directus-${var.instance}/.well-known/openid-configuration" AUTH_VYNIL_IDENTIFIER_KEY: "nickname" + PUBLIC_URL: "https://${local.directus-dns-name}" EOF } diff --git a/share/dataset-pg/index.yaml b/share/dataset-pg/index.yaml index 607b1a0..8a1d529 100644 --- a/share/dataset-pg/index.yaml +++ b/share/dataset-pg/index.yaml @@ -6,24 +6,10 @@ metadata: name: dataset-pg description: null options: - ingress-class: - default: traefik + sub-domain: + default: dataset-pg examples: - - traefik - type: string - roles: - default: [] - items: - properties: - name: - default: alt-account - type: string - type: object - type: array - domain: - default: your-company - examples: - - your-company + - dataset-pg type: string storage: default: 8Gi @@ -35,70 +21,6 @@ options: examples: - letsencrypt-prod type: string - domain-name: - default: your_company.com - examples: - - your_company.com - type: string - sub-domain: - default: dataset-pg - examples: - - dataset-pg - 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 extentions: default: directus: @@ -107,7 +29,7 @@ options: pullPolicy: IfNotPresent registry: docker.io repository: directus/directus - tag: 10.6.4 + tag: 10.7.0 storage: accessMode: ReadWriteOnce size: 1Gi @@ -134,7 +56,7 @@ options: pullPolicy: IfNotPresent registry: docker.io repository: directus/directus - tag: 10.6.4 + tag: 10.7.0 storage: accessMode: ReadWriteOnce size: 1Gi @@ -162,7 +84,7 @@ options: pullPolicy: IfNotPresent registry: docker.io repository: directus/directus - tag: 10.6.4 + tag: 10.7.0 storage: accessMode: ReadWriteOnce size: 1Gi @@ -176,7 +98,7 @@ options: pullPolicy: IfNotPresent registry: docker.io repository: directus/directus - tag: 10.6.4 + tag: 10.7.0 properties: pullPolicy: default: IfNotPresent @@ -188,7 +110,7 @@ options: default: directus/directus type: string tag: - default: 10.6.4 + default: 10.7.0 type: string type: object storage: @@ -294,6 +216,84 @@ options: 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 + 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 + roles: + default: [] + items: + properties: + name: + default: alt-account + type: string + type: object + type: array + ingress-class: + default: traefik + examples: + - traefik + type: string dependencies: - dist: null category: dbo