From 6069a5236da44ece420c9b7c970139179ebafe26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Thu, 21 Sep 2023 12:50:01 +0200 Subject: [PATCH] fix --- meta/domain-ci/apps.tf | 2 +- meta/domain-ci/index.yaml | 82 +++++++++++++++++++-------------------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/meta/domain-ci/apps.tf b/meta/domain-ci/apps.tf index 8b09a00..1c3e0e9 100644 --- a/meta/domain-ci/apps.tf +++ b/meta/domain-ci/apps.tf @@ -25,7 +25,7 @@ locals { "writeMany" = var.storage-classes.FilesystemReadWriteMany!=""?"true":"false" "storageClass" = var.storage-classes.FilesystemReadWriteMany!=""?var.storage-classes.FilesystemReadWriteMany:var.storage-classes.FilesystemReadWriteOnce } - }, { for k, v in var.dolibarr : k => v if contains(["storage-server","storage-agent"],k) }) + }, { for k, v in var.woodpecker : k => v if contains(["storage-server","storage-agent"],k) }) } resource "kubernetes_namespace_v1" "ci-ns" { diff --git a/meta/domain-ci/index.yaml b/meta/domain-ci/index.yaml index 3f44182..3c0eb6c 100644 --- a/meta/domain-ci/index.yaml +++ b/meta/domain-ci/index.yaml @@ -6,36 +6,11 @@ metadata: name: domain-ci description: null options: - backups: - default: - enable: false - endpoint: '' - key-id-key: s3-id - secret-key: s3-secret - secret-name: backup-settings + domain: + default: your-company examples: - - enable: false - endpoint: '' - key-id-key: s3-id - 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 - secret-key: - default: s3-secret - type: string - secret-name: - default: backup-settings - type: string - type: object + - your-company + type: string issuer: default: letsencrypt-prod examples: @@ -56,11 +31,6 @@ options: default: domain type: string type: object - domain-name: - default: your_company.com - examples: - - your_company.com - type: string woodpecker: default: enable: false @@ -71,6 +41,11 @@ options: default: false type: boolean type: object + ingress-class: + default: traefik + examples: + - traefik + type: string storage-classes: default: BlockReadWriteMany: '' @@ -106,16 +81,41 @@ options: default: true type: boolean type: object - domain: - default: your-company + domain-name: + default: your_company.com examples: - - your-company + - your_company.com type: string - ingress-class: - default: traefik + backups: + default: + enable: false + endpoint: '' + key-id-key: s3-id + secret-key: s3-secret + secret-name: backup-settings examples: - - traefik - type: string + - enable: false + endpoint: '' + key-id-key: s3-id + 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 + secret-key: + default: s3-secret + type: string + secret-name: + default: backup-settings + type: string + type: object dependencies: [] providers: kubernetes: true