From 025be779ff22c43136ff56e99f785f3a61ccdca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Fri, 26 Jan 2024 10:35:02 +0100 Subject: [PATCH] fix --- apps/code-server/index.yaml | 126 +++---- apps/code-server/presentation.tf | 12 +- apps/dbgate/index.yaml | 174 ++++----- apps/dbgate/presentation.tf | 12 +- apps/dolibarr/index.yaml | 352 +++++++++--------- apps/gitea/index.yaml | 524 +++++++++++++-------------- apps/gitea/presentation.tf | 10 +- apps/gramo/index.yaml | 50 +-- apps/gramo/presentation.tf | 6 +- apps/k8s-api/index.yaml | 16 +- apps/nextcloud/index.yaml | 440 +++++++++++----------- apps/nextcloud/presentation.tf | 16 +- apps/okd/index.yaml | 62 ++-- apps/okd/presentation.tf | 14 +- apps/traefik-ui/index.yaml | 24 +- apps/traefik-ui/presentation.tf | 12 +- apps/woodpecker/index.yaml | 66 ++-- apps/woodpecker/presentation.tf | 8 +- monitor/alertmanager/index.yaml | 80 ++-- monitor/alertmanager/presentation.tf | 4 +- monitor/grafana/index.yaml | 50 +-- monitor/grafana/presentation.tf | 4 +- monitor/prometheus/index.yaml | 88 ++--- monitor/prometheus/presentation.tf | 6 +- 24 files changed, 1078 insertions(+), 1078 deletions(-) diff --git a/apps/code-server/index.yaml b/apps/code-server/index.yaml index b3c6d83..0272232 100644 --- a/apps/code-server/index.yaml +++ b/apps/code-server/index.yaml @@ -6,21 +6,11 @@ metadata: name: code-server description: null options: - sub-domain: - default: code - examples: - - code - type: string domain: default: your-company examples: - your-company type: string - timezone: - default: Europe/Paris - examples: - - Europe/Paris - type: string admin: default: cluster: false @@ -36,53 +26,6 @@ options: default: false type: boolean type: object - storage: - default: - volume: - accessMode: ReadWriteOnce - size: 20Gi - type: Filesystem - description: Configure this app storage - examples: - - volume: - accessMode: ReadWriteOnce - size: 20Gi - type: Filesystem - properties: - volume: - default: - accessMode: ReadWriteOnce - size: 20Gi - type: Filesystem - properties: - accessMode: - default: ReadWriteOnce - enum: - - ReadWriteOnce - - ReadOnlyMany - - ReadWriteMany - type: string - size: - default: 20Gi - type: string - type: - default: Filesystem - enum: - - Filesystem - - Block - type: string - type: object - type: object - app-group: - default: dev - examples: - - dev - type: string - no-editor: - default: false - examples: - - false - type: boolean images: default: codeserver: @@ -122,20 +65,77 @@ options: type: number type: object type: object - ingress-class: - default: traefik + storage: + default: + volume: + accessMode: ReadWriteOnce + size: 20Gi + type: Filesystem + description: Configure this app storage examples: - - traefik + - volume: + accessMode: ReadWriteOnce + size: 20Gi + type: Filesystem + properties: + volume: + default: + accessMode: ReadWriteOnce + size: 20Gi + type: Filesystem + properties: + accessMode: + default: ReadWriteOnce + enum: + - ReadWriteOnce + - ReadOnlyMany + - ReadWriteMany + type: string + size: + default: 20Gi + type: string + type: + default: Filesystem + enum: + - Filesystem + - Block + type: string + type: object + type: object + timezone: + default: Europe/Paris + examples: + - Europe/Paris + type: string + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod type: string domain-name: default: your-company.com examples: - your-company.com type: string - issuer: - default: letsencrypt-prod + ingress-class: + default: traefik examples: - - letsencrypt-prod + - traefik + type: string + app-group: + default: dev + examples: + - dev + type: string + no-editor: + default: false + examples: + - false + type: boolean + sub-domain: + default: code + examples: + - code type: string dependencies: - dist: null diff --git a/apps/code-server/presentation.tf b/apps/code-server/presentation.tf index 97d5df6..a15ff6f 100644 --- a/apps/code-server/presentation.tf +++ b/apps/code-server/presentation.tf @@ -16,7 +16,7 @@ locals { } module "service" { - source = "/dist/modules/service" + source = "git::https://git.solidite.fr/vynil/kydah-modules.git//service" component = var.component instance = var.instance namespace = var.namespace @@ -29,12 +29,12 @@ module "service" { } module "ingress" { - source = "/dist/modules/ingress" + source = "git::https://git.solidite.fr/vynil/kydah-modules.git//ingress" component = "" instance = var.instance namespace = var.namespace issuer = var.issuer - ingress-class = var.ingress-class + ingress_class = var.ingress-class labels = local.common-labels dns_names = local.dns_names middlewares = ["forward-${local.app_name}"] @@ -45,10 +45,10 @@ module "ingress" { } module "application" { - source = "/dist/modules/application" + source = "git::https://git.solidite.fr/vynil/kydah-modules.git//application" component = var.component instance = var.instance - app-group = var.app-group + app_group = var.app-group dns_name = local.dns_name icon = local.icon protocol_provider = module.forward.provider-id @@ -68,7 +68,7 @@ provider "restapi" { } module "forward" { - source = "/dist/modules/forward" + source = "git::https://git.solidite.fr/vynil/kydah-modules.git//forward" component = var.component instance = var.instance domain = var.domain diff --git a/apps/dbgate/index.yaml b/apps/dbgate/index.yaml index d59901f..42f6010 100644 --- a/apps/dbgate/index.yaml +++ b/apps/dbgate/index.yaml @@ -6,72 +6,6 @@ metadata: name: dbgate description: null options: - mongo: - default: [] - examples: - - [] - items: - properties: - dbname: - default: '' - type: string - name: - default: '' - type: string - namespace: - default: '' - type: string - secret: - properties: - key: - default: '' - type: string - name: - default: '' - type: string - type: object - username: - default: '' - type: string - type: object - type: array - storage: - default: - volume: - accessMode: ReadWriteOnce - size: 1Gi - type: Filesystem - description: Configure this app storage - examples: - - volume: - accessMode: ReadWriteOnce - size: 1Gi - type: Filesystem - properties: - volume: - default: - accessMode: ReadWriteOnce - size: 1Gi - type: Filesystem - properties: - accessMode: - default: ReadWriteOnce - enum: - - ReadWriteOnce - - ReadOnlyMany - - ReadWriteMany - type: string - size: - default: 1Gi - type: string - type: - default: Filesystem - enum: - - Filesystem - - Block - type: string - type: object - type: object images: default: dbgate: @@ -116,11 +50,82 @@ options: examples: - dev type: string + storage: + default: + volume: + accessMode: ReadWriteOnce + size: 1Gi + type: Filesystem + description: Configure this app storage + examples: + - volume: + accessMode: ReadWriteOnce + size: 1Gi + type: Filesystem + properties: + volume: + default: + accessMode: ReadWriteOnce + size: 1Gi + type: Filesystem + properties: + accessMode: + default: ReadWriteOnce + enum: + - ReadWriteOnce + - ReadOnlyMany + - ReadWriteMany + type: string + size: + default: 1Gi + type: string + type: + default: Filesystem + enum: + - Filesystem + - Block + type: string + type: object + type: object + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string + domain-name: + default: your_company.com + examples: + - your_company.com + type: string + redis: + default: [] + examples: + - [] + items: + properties: + name: + default: '' + type: string + namespace: + default: '' + type: string + type: object + type: array + domain: + default: your-company + examples: + - your-company + type: string sub-domain: default: dbgate examples: - dbgate type: string + ingress-class: + default: traefik + examples: + - traefik + type: string pg: default: [] examples: @@ -150,11 +155,6 @@ options: type: string type: object type: array - domain-name: - default: your_company.com - examples: - - your_company.com - type: string maria: default: [] examples: @@ -184,33 +184,33 @@ options: type: string type: object type: array - domain: - default: your-company - examples: - - your-company - type: string - ingress-class: - default: traefik - examples: - - traefik - type: string - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string - redis: + mongo: default: [] examples: - [] items: properties: + dbname: + default: '' + type: string name: default: '' type: string namespace: default: '' type: string + secret: + properties: + key: + default: '' + type: string + name: + default: '' + type: string + type: object + username: + default: '' + type: string type: object type: array dependencies: diff --git a/apps/dbgate/presentation.tf b/apps/dbgate/presentation.tf index d429a72..9a71c9f 100644 --- a/apps/dbgate/presentation.tf +++ b/apps/dbgate/presentation.tf @@ -16,7 +16,7 @@ locals { } module "service" { - source = "/dist/modules/service" + source = "git::https://git.solidite.fr/vynil/kydah-modules.git//service" component = var.component instance = var.instance namespace = var.namespace @@ -29,12 +29,12 @@ module "service" { } module "ingress" { - source = "/dist/modules/ingress" + source = "git::https://git.solidite.fr/vynil/kydah-modules.git//ingress" component = "" instance = var.instance namespace = var.namespace issuer = var.issuer - ingress-class = var.ingress-class + ingress_class = var.ingress-class labels = local.common-labels dns_names = local.dns_names middlewares = [] @@ -45,10 +45,10 @@ module "ingress" { } module "application" { - source = "/dist/modules/application" + source = "git::https://git.solidite.fr/vynil/kydah-modules.git//application" component = var.component instance = var.instance - app-group = var.app-group + app_group = var.app-group dns_name = local.dns_name icon = local.icon protocol_provider = module.oauth2.provider-id @@ -58,7 +58,7 @@ module "application" { } module "oauth2" { - source = "/dist/modules/oauth2" + source = "git::https://git.solidite.fr/vynil/kydah-modules.git//oauth2" component = var.component instance = var.instance namespace = var.namespace diff --git a/apps/dolibarr/index.yaml b/apps/dolibarr/index.yaml index 11e275a..e815cd5 100644 --- a/apps/dolibarr/index.yaml +++ b/apps/dolibarr/index.yaml @@ -6,23 +6,6 @@ metadata: name: dolibarr description: null options: - redis: - default: - exporter: - enabled: true - examples: - - exporter: - enabled: true - properties: - exporter: - default: - enabled: true - properties: - enabled: - default: true - type: boolean - type: object - type: object backups: default: enable: false @@ -129,138 +112,28 @@ options: default: false type: boolean type: object - hpa: - default: - avg-cpu: 50 - max-replicas: 5 - min-replicas: 1 - examples: - - avg-cpu: 50 - max-replicas: 5 - min-replicas: 1 - properties: - avg-cpu: - default: 50 - type: integer - max-replicas: - default: 5 - type: integer - min-replicas: - default: 1 - type: integer - type: object - resources: - default: - limits: - cpu: 200m - memory: 256Mi - requests: - cpu: 50m - memory: 100Mi - examples: - - limits: - cpu: 200m - memory: 256Mi - requests: - cpu: 50m - memory: 100Mi - properties: - limits: - default: - cpu: 200m - memory: 256Mi - properties: - cpu: - default: 200m - type: string - memory: - default: 256Mi - type: string - type: object - requests: - default: - cpu: 50m - memory: 100Mi - properties: - cpu: - default: 50m - type: string - memory: - default: 100Mi - type: string - type: object - type: object app-group: default: '' examples: - '' type: string - storage: + redis: default: - postgres: - size: 5Gi - redis: - size: 2Gi - volume: - accessMode: ReadWriteOnce - size: 1Gi - type: Filesystem - description: Configure this app storage + exporter: + enabled: true examples: - - postgres: - size: 5Gi - redis: - size: 2Gi - volume: - accessMode: ReadWriteOnce - size: 1Gi - type: Filesystem + - exporter: + enabled: true properties: - postgres: + exporter: default: - size: 5Gi + enabled: true properties: - size: - default: 5Gi - type: string - type: object - redis: - default: - size: 2Gi - properties: - size: - default: 2Gi - type: string - type: object - volume: - default: - accessMode: ReadWriteOnce - size: 1Gi - type: Filesystem - properties: - accessMode: - default: ReadWriteOnce - enum: - - ReadWriteOnce - - ReadOnlyMany - - ReadWriteMany - type: string - size: - default: 1Gi - type: string - type: - default: Filesystem - enum: - - Filesystem - - Block - type: string + enabled: + default: true + type: boolean type: object type: object - ingress-class: - default: traefik - examples: - - traefik - type: string postgres: default: replicas: 1 @@ -271,36 +144,6 @@ options: default: 1 type: integer type: object - log-level: - default: 5 - examples: - - 5 - type: integer - user-groups: - default: - - admin: true - name: dolibarr-admin - examples: - - - admin: true - name: dolibarr-admin - items: - properties: - admin: - type: boolean - name: - type: string - type: object - type: array - parameters: - default: - MAIN_LANG_DEFAULT: auto - examples: - - MAIN_LANG_DEFAULT: auto - properties: - MAIN_LANG_DEFAULT: - default: auto - type: string - type: object images: default: dolibarr: @@ -450,26 +293,153 @@ options: type: string type: object type: object + storage: + default: + postgres: + size: 5Gi + redis: + size: 2Gi + volume: + accessMode: ReadWriteOnce + size: 1Gi + type: Filesystem + description: Configure this app storage + examples: + - postgres: + size: 5Gi + redis: + size: 2Gi + volume: + accessMode: ReadWriteOnce + size: 1Gi + type: Filesystem + properties: + postgres: + default: + size: 5Gi + properties: + size: + default: 5Gi + type: string + type: object + redis: + default: + size: 2Gi + properties: + size: + default: 2Gi + type: string + type: object + volume: + default: + accessMode: ReadWriteOnce + size: 1Gi + type: Filesystem + properties: + accessMode: + default: ReadWriteOnce + enum: + - ReadWriteOnce + - ReadOnlyMany + - ReadWriteMany + type: string + size: + default: 1Gi + type: string + type: + default: Filesystem + enum: + - Filesystem + - Block + type: string + type: object + type: object + resources: + default: + limits: + cpu: 200m + memory: 256Mi + requests: + cpu: 50m + memory: 100Mi + examples: + - limits: + cpu: 200m + memory: 256Mi + requests: + cpu: 50m + memory: 100Mi + properties: + limits: + default: + cpu: 200m + memory: 256Mi + properties: + cpu: + default: 200m + type: string + memory: + default: 256Mi + type: string + type: object + requests: + default: + cpu: 50m + memory: 100Mi + properties: + cpu: + default: 50m + type: string + memory: + default: 100Mi + type: string + type: object + type: object domain: default: your-company examples: - your-company type: string - issuer: - default: letsencrypt-prod + parameters: + default: + MAIN_LANG_DEFAULT: auto examples: - - letsencrypt-prod - type: string - sub-domain: - default: erp - examples: - - erp - type: string + - MAIN_LANG_DEFAULT: auto + properties: + MAIN_LANG_DEFAULT: + default: auto + type: string + type: object domain-name: default: your_company.com examples: - your_company.com type: string + ingress-class: + default: traefik + examples: + - traefik + type: string + hpa: + default: + avg-cpu: 50 + max-replicas: 5 + min-replicas: 1 + examples: + - avg-cpu: 50 + max-replicas: 5 + min-replicas: 1 + properties: + avg-cpu: + default: 50 + type: integer + max-replicas: + default: 5 + type: integer + min-replicas: + default: 1 + type: integer + type: object modules: default: - societe @@ -478,6 +448,36 @@ options: items: type: string type: array + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string + user-groups: + default: + - admin: true + name: dolibarr-admin + examples: + - - admin: true + name: dolibarr-admin + items: + properties: + admin: + type: boolean + name: + type: string + type: object + type: array + sub-domain: + default: erp + examples: + - erp + type: string + log-level: + default: 5 + examples: + - 5 + type: integer dependencies: - dist: null category: share diff --git a/apps/gitea/index.yaml b/apps/gitea/index.yaml index 0513a5d..d7d5856 100644 --- a/apps/gitea/index.yaml +++ b/apps/gitea/index.yaml @@ -9,76 +9,55 @@ metadata: A painless self-hosted Git service. Gitea is a community managed lightweight code hosting solution written in Go. It is published under the MIT license. options: - postgres: - default: - replicas: 1 + replicas: + default: 1 examples: - - replicas: 1 + - 1 + type: integer + webhook: + default: + allowed-hosts: private + skip-tls-verify: false + examples: + - allowed-hosts: private + skip-tls-verify: false properties: - replicas: - default: 1 - type: integer + allowed-hosts: + default: private + type: string + skip-tls-verify: + default: false + type: boolean type: object - storage: + load-balancer: default: - postgres: - size: 10Gi - redis: - size: 2Gi - volume: - accessMode: ReadWriteOnce - size: 10Gi - type: Filesystem - description: Configure this app storage + ip: '' examples: - - postgres: - size: 10Gi - redis: - size: 2Gi - volume: - accessMode: ReadWriteOnce - size: 10Gi - type: Filesystem + - ip: '' properties: - postgres: - default: - size: 10Gi - properties: - size: - default: 10Gi - type: string - type: object - redis: - default: - size: 2Gi - properties: - size: - default: 2Gi - type: string - type: object - volume: - default: - accessMode: ReadWriteOnce - size: 10Gi - type: Filesystem - properties: - accessMode: - default: ReadWriteOnce - enum: - - ReadWriteOnce - - ReadOnlyMany - - ReadWriteMany - type: string - size: - default: 10Gi - type: string - type: - default: Filesystem - enum: - - Filesystem - - Block - type: string - type: object + ip: + default: '' + type: string + type: object + push-create: + default: + org: 'true' + private: 'false' + user: 'true' + examples: + - org: 'true' + private: 'false' + user: 'true' + properties: + org: + default: 'true' + type: string + private: + default: 'false' + type: string + user: + default: 'true' + type: string type: object redis: default: @@ -97,16 +76,152 @@ options: type: boolean type: object type: object - replicas: - default: 1 + sub-domain: + default: git examples: - - 1 - type: integer - theme: - default: gitea-modern - examples: - - gitea-modern + - git type: string + domain: + default: your-company + examples: + - your-company + type: string + app-group: + default: dev + examples: + - dev + type: string + domain-name: + default: your_company.com + examples: + - your_company.com + type: string + ssh-sub-domain: + default: git + examples: + - git + type: string + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string + backups: + default: + enable: false + endpoint: '' + key-id-key: s3-id + restic-key: bck-password + retention: + db: 30d + keepDaily: 14 + keepMonthly: 12 + keepWeekly: 6 + keepYearly: 12 + schedule: + backup: 10 3 * * * + check: 10 5 * * 1 + db: 10 3 * * * + prune: 10 1 * * 0 + secret-key: s3-secret + secret-name: backup-settings + use-barman: false + examples: + - enable: false + endpoint: '' + key-id-key: s3-id + restic-key: bck-password + retention: + db: 30d + keepDaily: 14 + keepMonthly: 12 + keepWeekly: 6 + keepYearly: 12 + schedule: + backup: 10 3 * * * + check: 10 5 * * 1 + db: 10 3 * * * + prune: 10 1 * * 0 + secret-key: s3-secret + secret-name: backup-settings + use-barman: false + properties: + enable: + default: false + type: boolean + endpoint: + default: '' + type: string + key-id-key: + default: s3-id + type: string + restic-key: + default: bck-password + type: string + retention: + default: + db: 30d + keepDaily: 14 + keepMonthly: 12 + keepWeekly: 6 + keepYearly: 12 + properties: + db: + default: 30d + type: string + keepDaily: + default: 14 + type: integer + keepMonthly: + default: 12 + type: integer + keepWeekly: + default: 6 + type: integer + keepYearly: + default: 12 + type: integer + type: object + schedule: + default: + backup: 10 3 * * * + check: 10 5 * * 1 + db: 10 3 * * * + prune: 10 1 * * 0 + properties: + backup: + default: 10 3 * * * + type: string + check: + default: 10 5 * * 1 + type: string + db: + default: 10 3 * * * + type: string + prune: + default: 10 1 * * 0 + type: string + type: object + secret-key: + default: s3-secret + type: string + secret-name: + default: backup-settings + type: string + use-barman: + default: false + type: boolean + type: object + postgres: + default: + replicas: 1 + examples: + - replicas: 1 + properties: + replicas: + default: 1 + type: integer + type: object images: default: gitea: @@ -238,76 +353,26 @@ options: type: string type: object type: object - ssh-sub-domain: - default: git - examples: - - git - type: string - app-group: - default: dev - examples: - - dev - type: string - load-balancer: - default: - ip: '' - examples: - - ip: '' - properties: - ip: - default: '' - type: string - type: object - disable-registration: - default: true - examples: - - true - type: boolean - ssh-port: - default: 2222 - examples: - - 2222 - type: integer - sub-domain: - default: git - examples: - - git - type: string - domain-name: - default: your_company.com - examples: - - your_company.com - type: string - release: - default: 8.3.0 - examples: - - 8.3.0 - type: string default-branch: default: main examples: - main type: string - push-create: - default: - org: 'true' - private: 'false' - user: 'true' + ingress-class: + default: traefik examples: - - org: 'true' - private: 'false' - user: 'true' - properties: - org: - default: 'true' - type: string - private: - default: 'false' - type: string - user: - default: 'true' - type: string - type: object + - traefik + type: string + theme: + default: gitea-modern + examples: + - gitea-modern + type: string + ssh-port: + default: 2222 + examples: + - 2222 + type: integer admin: default: email: git-admin@git.your_company.com @@ -323,146 +388,81 @@ options: default: gitea_admin type: string type: object - webhook: - default: - allowed-hosts: private - skip-tls-verify: false - examples: - - allowed-hosts: private - skip-tls-verify: false - properties: - allowed-hosts: - default: private - type: string - skip-tls-verify: - default: false - type: boolean - type: object timezone: default: Europe/Paris examples: - Europe/Paris type: string - backups: + disable-registration: + default: true + examples: + - true + type: boolean + storage: default: - enable: false - endpoint: '' - key-id-key: s3-id - restic-key: bck-password - retention: - db: 30d - keepDaily: 14 - keepMonthly: 12 - keepWeekly: 6 - keepYearly: 12 - schedule: - backup: 10 3 * * * - check: 10 5 * * 1 - db: 10 3 * * * - prune: 10 1 * * 0 - secret-key: s3-secret - secret-name: backup-settings - use-barman: false + postgres: + size: 10Gi + redis: + size: 2Gi + volume: + accessMode: ReadWriteOnce + size: 10Gi + type: Filesystem + description: Configure this app storage examples: - - enable: false - endpoint: '' - key-id-key: s3-id - restic-key: bck-password - retention: - db: 30d - keepDaily: 14 - keepMonthly: 12 - keepWeekly: 6 - keepYearly: 12 - schedule: - backup: 10 3 * * * - check: 10 5 * * 1 - db: 10 3 * * * - prune: 10 1 * * 0 - secret-key: s3-secret - secret-name: backup-settings - use-barman: false + - postgres: + size: 10Gi + redis: + size: 2Gi + volume: + accessMode: ReadWriteOnce + size: 10Gi + type: Filesystem properties: - enable: - default: false - type: boolean - endpoint: - default: '' - type: string - key-id-key: - default: s3-id - type: string - restic-key: - default: bck-password - type: string - retention: + postgres: default: - db: 30d - keepDaily: 14 - keepMonthly: 12 - keepWeekly: 6 - keepYearly: 12 + size: 10Gi properties: - db: - default: 30d - type: string - keepDaily: - default: 14 - type: integer - keepMonthly: - default: 12 - type: integer - keepWeekly: - default: 6 - type: integer - keepYearly: - default: 12 - type: integer - type: object - schedule: - default: - backup: 10 3 * * * - check: 10 5 * * 1 - db: 10 3 * * * - prune: 10 1 * * 0 - properties: - backup: - default: 10 3 * * * - type: string - check: - default: 10 5 * * 1 - type: string - db: - default: 10 3 * * * - type: string - prune: - default: 10 1 * * 0 + size: + default: 10Gi + type: string + type: object + redis: + default: + size: 2Gi + properties: + size: + default: 2Gi + type: string + type: object + volume: + default: + accessMode: ReadWriteOnce + size: 10Gi + type: Filesystem + properties: + accessMode: + default: ReadWriteOnce + enum: + - ReadWriteOnce + - ReadOnlyMany + - ReadWriteMany + type: string + size: + default: 10Gi + type: string + type: + default: Filesystem + enum: + - Filesystem + - Block type: string type: object - secret-key: - default: s3-secret - type: string - secret-name: - default: backup-settings - type: string - use-barman: - default: false - type: boolean type: object - ingress-class: - default: traefik + release: + default: 8.3.0 examples: - - traefik - type: string - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string - domain: - default: your-company - examples: - - your-company + - 8.3.0 type: string dependencies: - dist: null diff --git a/apps/gitea/presentation.tf b/apps/gitea/presentation.tf index de740da..e297e79 100644 --- a/apps/gitea/presentation.tf +++ b/apps/gitea/presentation.tf @@ -29,12 +29,12 @@ locals { # } module "ingress" { - source = "/dist/modules/ingress" + source = "git::https://git.solidite.fr/vynil/kydah-modules.git//ingress" component = "" instance = var.instance namespace = var.namespace issuer = var.issuer - ingress-class = var.ingress-class + ingress_class = var.ingress-class labels = local.common-labels dns_names = local.dns_names middlewares = [] @@ -45,10 +45,10 @@ module "ingress" { } module "application" { - source = "/dist/modules/application" + source = "git::https://git.solidite.fr/vynil/kydah-modules.git//application" component = var.component instance = var.instance - app-group = var.app-group + app_group = var.app-group dns_name = local.dns_name icon = local.icon protocol_provider = module.oauth2.provider-id @@ -58,7 +58,7 @@ module "application" { } module "oauth2" { - source = "/dist/modules/oauth2" + source = "git::https://git.solidite.fr/vynil/kydah-modules.git//oauth2" component = var.component instance = var.instance namespace = var.namespace diff --git a/apps/gramo/index.yaml b/apps/gramo/index.yaml index 7269176..e16a2ed 100644 --- a/apps/gramo/index.yaml +++ b/apps/gramo/index.yaml @@ -6,31 +6,31 @@ metadata: name: gramo description: null options: - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string sub-domain: default: gramo examples: - gramo type: string + cluster-admin: + default: false + examples: + - false + type: boolean + app-group: + default: infra + examples: + - infra + type: string + domain-name: + default: your_company.com + examples: + - your_company.com + type: string managed: default: false examples: - false type: boolean - domain-name: - default: your_company.com - examples: - - your_company.com - type: string - namespaces: - default: [] - items: - type: string - type: array images: default: gramo: @@ -70,26 +70,26 @@ options: type: string type: object type: object - cluster-admin: - default: false - examples: - - false - type: boolean - app-group: - default: infra - examples: - - infra - type: string ingress-class: default: traefik examples: - traefik type: string + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string domain: default: your-company examples: - your-company type: string + namespaces: + default: [] + items: + type: string + type: array dependencies: - dist: null category: share diff --git a/apps/gramo/presentation.tf b/apps/gramo/presentation.tf index 59baf2f..3aa8aed 100644 --- a/apps/gramo/presentation.tf +++ b/apps/gramo/presentation.tf @@ -34,7 +34,7 @@ module "ingress" { instance = var.instance namespace = var.namespace issuer = var.issuer - ingress-class = var.ingress-class + ingress_class = var.ingress-class labels = local.common-labels dns_names = local.dns_names middlewares = ["forward-${local.app_name}"] @@ -48,7 +48,7 @@ module "application" { source = "git::https://git.solidite.fr/vynil/kydah-modules.git//application" component = var.component instance = var.instance - app-group = var.app-group + app_group = var.app-group dns_name = local.dns_name icon = local.icon protocol_provider = module.forward.provider-id @@ -73,7 +73,7 @@ module "forward" { instance = var.instance domain = var.domain namespace = var.namespace - ingress-class = var.ingress-class + ingress_class = var.ingress-class labels = local.common-labels dns_names = local.dns_names service = local.service diff --git a/apps/k8s-api/index.yaml b/apps/k8s-api/index.yaml index 5775147..95c560f 100644 --- a/apps/k8s-api/index.yaml +++ b/apps/k8s-api/index.yaml @@ -6,16 +6,16 @@ metadata: name: k8s-api description: Access to the kubernetes api options: - domain-name: - default: your_company.com - examples: - - your_company.com - type: string domain: default: your-company examples: - your-company type: string + ingress-class: + default: traefik + examples: + - traefik + type: string sub-domain: default: api examples: @@ -26,10 +26,10 @@ options: examples: - letsencrypt-prod type: string - ingress-class: - default: traefik + domain-name: + default: your_company.com examples: - - traefik + - your_company.com type: string dependencies: - dist: null diff --git a/apps/nextcloud/index.yaml b/apps/nextcloud/index.yaml index 0a78fe6..ddb2873 100644 --- a/apps/nextcloud/index.yaml +++ b/apps/nextcloud/index.yaml @@ -6,36 +6,6 @@ metadata: name: nextcloud description: null options: - hpa: - default: - avg-cpu: 50 - max-replicas: 5 - min-replicas: 1 - examples: - - avg-cpu: 50 - max-replicas: 5 - min-replicas: 1 - properties: - avg-cpu: - default: 50 - type: integer - max-replicas: - default: 5 - type: integer - min-replicas: - default: 1 - type: integer - type: object - sub-domain: - default: files - examples: - - files - type: string - ingress-class: - default: traefik - examples: - - traefik - type: string postgres: default: replicas: 1 @@ -46,116 +16,11 @@ options: default: 1 type: integer type: object - openid-name: - default: vynil + app-group: + default: '' examples: - - vynil + - '' type: string - domain: - default: your-company - examples: - - your-company - type: string - admin: - default: - name: nextcloud_admin - examples: - - name: nextcloud_admin - properties: - name: - default: nextcloud_admin - type: string - type: object - apps: - default: - audioplayer: false - bookmarks: false - bpm: false - calendar: false - collabora: false - contacts: false - deck: false - groupfolders: true - mindmap: false - music: false - notes: false - onlyoffice: false - passman: false - spreed: false - tables: false - tasks: false - texteditor: true - examples: - - audioplayer: false - bookmarks: false - bpm: false - calendar: false - collabora: false - contacts: false - deck: false - groupfolders: true - mindmap: false - music: false - notes: false - onlyoffice: false - passman: false - spreed: false - tables: false - tasks: false - texteditor: true - properties: - audioplayer: - default: false - type: boolean - bookmarks: - default: false - type: boolean - bpm: - default: false - type: boolean - calendar: - default: false - type: boolean - collabora: - default: false - type: boolean - contacts: - default: false - type: boolean - deck: - default: false - type: boolean - groupfolders: - default: true - type: boolean - mindmap: - default: false - type: boolean - music: - default: false - type: boolean - notes: - default: false - type: boolean - onlyoffice: - default: false - type: boolean - passman: - default: false - type: boolean - spreed: - default: false - type: boolean - tables: - default: false - type: boolean - tasks: - default: false - type: boolean - texteditor: - default: true - type: boolean - type: object images: default: collabora: @@ -411,6 +276,134 @@ options: type: string type: object type: object + admin: + default: + name: nextcloud_admin + examples: + - name: nextcloud_admin + properties: + name: + default: nextcloud_admin + type: string + type: object + ingress-class: + default: traefik + examples: + - traefik + type: string + openid-name: + default: vynil + examples: + - vynil + type: string + storage: + default: + postgres: + size: 5Gi + redis: + size: 2Gi + volume: + accessMode: ReadWriteOnce + size: 10Gi + type: Filesystem + description: Configure this app storage + examples: + - postgres: + size: 5Gi + redis: + size: 2Gi + volume: + accessMode: ReadWriteOnce + size: 10Gi + type: Filesystem + properties: + postgres: + default: + size: 5Gi + properties: + size: + default: 5Gi + type: string + type: object + redis: + default: + size: 2Gi + properties: + size: + default: 2Gi + type: string + type: object + volume: + default: + accessMode: ReadWriteOnce + size: 10Gi + type: Filesystem + properties: + accessMode: + default: ReadWriteOnce + enum: + - ReadWriteOnce + - ReadOnlyMany + - ReadWriteMany + type: string + size: + default: 10Gi + type: string + type: + default: Filesystem + enum: + - Filesystem + - Block + type: string + type: object + type: object + redis: + default: + exporter: + enabled: true + examples: + - exporter: + enabled: true + properties: + exporter: + default: + enabled: true + properties: + enabled: + default: true + type: boolean + type: object + type: object + domain-name: + default: your_company.com + examples: + - your_company.com + type: string + domain: + default: your-company + examples: + - your-company + type: string + hpa: + default: + avg-cpu: 50 + max-replicas: 5 + min-replicas: 1 + examples: + - avg-cpu: 50 + max-replicas: 5 + min-replicas: 1 + properties: + avg-cpu: + default: 50 + type: integer + max-replicas: + default: 5 + type: integer + min-replicas: + default: 1 + type: integer + type: object backups: default: enable: false @@ -522,94 +515,101 @@ options: examples: - letsencrypt-prod type: string - domain-name: - default: your_company.com + sub-domain: + default: files examples: - - your_company.com + - files type: string - redis: + apps: default: - exporter: - enabled: true + audioplayer: false + bookmarks: false + bpm: false + calendar: false + collabora: false + contacts: false + deck: false + groupfolders: true + mindmap: false + music: false + notes: false + onlyoffice: false + passman: false + spreed: false + tables: false + tasks: false + texteditor: true examples: - - exporter: - enabled: true + - audioplayer: false + bookmarks: false + bpm: false + calendar: false + collabora: false + contacts: false + deck: false + groupfolders: true + mindmap: false + music: false + notes: false + onlyoffice: false + passman: false + spreed: false + tables: false + tasks: false + texteditor: true properties: - exporter: - default: - enabled: true - properties: - enabled: - default: true - type: boolean - type: object + audioplayer: + default: false + type: boolean + bookmarks: + default: false + type: boolean + bpm: + default: false + type: boolean + calendar: + default: false + type: boolean + collabora: + default: false + type: boolean + contacts: + default: false + type: boolean + deck: + default: false + type: boolean + groupfolders: + default: true + type: boolean + mindmap: + default: false + type: boolean + music: + default: false + type: boolean + notes: + default: false + type: boolean + onlyoffice: + default: false + type: boolean + passman: + default: false + type: boolean + spreed: + default: false + type: boolean + tables: + default: false + type: boolean + tasks: + default: false + type: boolean + texteditor: + default: true + type: boolean type: object - storage: - default: - postgres: - size: 5Gi - redis: - size: 2Gi - volume: - accessMode: ReadWriteOnce - size: 10Gi - type: Filesystem - description: Configure this app storage - examples: - - postgres: - size: 5Gi - redis: - size: 2Gi - volume: - accessMode: ReadWriteOnce - size: 10Gi - type: Filesystem - properties: - postgres: - default: - size: 5Gi - properties: - size: - default: 5Gi - type: string - type: object - redis: - default: - size: 2Gi - properties: - size: - default: 2Gi - type: string - type: object - volume: - default: - accessMode: ReadWriteOnce - size: 10Gi - type: Filesystem - properties: - accessMode: - default: ReadWriteOnce - enum: - - ReadWriteOnce - - ReadOnlyMany - - ReadWriteMany - type: string - size: - default: 10Gi - type: string - type: - default: Filesystem - enum: - - Filesystem - - Block - type: string - type: object - type: object - app-group: - default: '' - examples: - - '' - type: string dependencies: - dist: null category: share diff --git a/apps/nextcloud/presentation.tf b/apps/nextcloud/presentation.tf index 230e7b7..6b346e5 100644 --- a/apps/nextcloud/presentation.tf +++ b/apps/nextcloud/presentation.tf @@ -26,7 +26,7 @@ locals { } module "ingress" { - source = "/dist/modules/ingress" + source = "git::https://git.solidite.fr/vynil/kydah-modules.git//ingress" component = "" instance = var.instance namespace = var.namespace @@ -42,7 +42,7 @@ module "ingress" { } module "application" { - source = "/dist/modules/application" + source = "git::https://git.solidite.fr/vynil/kydah-modules.git//application" component = var.component instance = var.instance app-group = var.app-group @@ -55,7 +55,7 @@ module "application" { } module "oauth2" { - source = "/dist/modules/oauth2" + source = "git::https://git.solidite.fr/vynil/kydah-modules.git//oauth2" component = var.component instance = var.instance namespace = var.namespace @@ -71,7 +71,7 @@ module "oauth2" { module "collabora-service" { count = var.apps.collabora ? 1 : 0 - source = "/dist/modules/service" + source = "git::https://git.solidite.fr/vynil/kydah-modules.git//service" component = "collabora" instance = var.instance namespace = var.namespace @@ -85,7 +85,7 @@ module "collabora-service" { module "collabora-ingress" { count = var.apps.collabora ? 1 : 0 - source = "/dist/modules/ingress" + source = "git::https://git.solidite.fr/vynil/kydah-modules.git//ingress" component = "collabora" instance = var.instance namespace = var.namespace @@ -102,7 +102,7 @@ module "collabora-ingress" { module "onlyoffice-service" { count = var.apps.onlyoffice ? 1 : 0 - source = "/dist/modules/service" + source = "git::https://git.solidite.fr/vynil/kydah-modules.git//service" component = "onlyoffice" instance = var.instance namespace = var.namespace @@ -116,12 +116,12 @@ module "onlyoffice-service" { module "onlyoffice-ingress" { count = var.apps.onlyoffice ? 1 : 0 - source = "/dist/modules/ingress" + source = "git::https://git.solidite.fr/vynil/kydah-modules.git//ingress" component = "onlyoffice" instance = var.instance namespace = var.namespace issuer = var.issuer - ingress-class = var.ingress-class + ingress_class = var.ingress-class labels = local.onlyoffice-labels dns_names = [local.dns-onlyoffice] middlewares = [] diff --git a/apps/okd/index.yaml b/apps/okd/index.yaml index c6dbae9..a4187cf 100644 --- a/apps/okd/index.yaml +++ b/apps/okd/index.yaml @@ -6,16 +6,36 @@ metadata: name: okd description: null options: - namespaces: - default: [] - items: - type: string - type: array + app-group: + default: infra + examples: + - infra + type: string + managed: + default: false + examples: + - false + type: boolean + cluster-admin: + default: false + examples: + - false + type: boolean + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string domain-name: default: your_company.com examples: - your_company.com type: string + namespaces: + default: [] + items: + type: string + type: array images: default: okd: @@ -55,41 +75,21 @@ options: type: string type: object type: object - ingress-class: - default: traefik + domain: + default: your-company examples: - - traefik - type: string - app-group: - default: infra - examples: - - infra + - your-company type: string sub-domain: default: okd examples: - okd type: string - domain: - default: your-company + ingress-class: + default: traefik examples: - - your-company + - traefik type: string - managed: - default: false - examples: - - false - type: boolean - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string - cluster-admin: - default: false - examples: - - false - type: boolean dependencies: - dist: null category: share diff --git a/apps/okd/presentation.tf b/apps/okd/presentation.tf index af5596a..90334b1 100644 --- a/apps/okd/presentation.tf +++ b/apps/okd/presentation.tf @@ -16,7 +16,7 @@ locals { } module "service" { - source = "/dist/modules/service" + source = "git::https://git.solidite.fr/vynil/kydah-modules.git//service" component = var.component instance = var.instance namespace = var.namespace @@ -29,12 +29,12 @@ module "service" { } module "ingress" { - source = "/dist/modules/ingress" + source = "git::https://git.solidite.fr/vynil/kydah-modules.git//ingress" component = "" instance = var.instance namespace = var.namespace issuer = var.issuer - ingress-class = var.ingress-class + ingress_class = var.ingress-class labels = local.common-labels dns_names = local.dns_names middlewares = ["forward-${local.app_name}"] @@ -45,10 +45,10 @@ module "ingress" { } module "application" { - source = "/dist/modules/application" + source = "git::https://git.solidite.fr/vynil/kydah-modules.git//application" component = var.component instance = var.instance - app-group = var.app-group + app_group = var.app-group dns_name = local.dns_name icon = local.icon protocol_provider = module.forward.provider-id @@ -68,12 +68,12 @@ provider "restapi" { } module "forward" { - source = "/dist/modules/forward" + source = "git::https://git.solidite.fr/vynil/kydah-modules.git//forward" component = var.component instance = var.instance domain = var.domain namespace = var.namespace - ingress-class = var.ingress-class + ingress_class = var.ingress-class labels = local.common-labels dns_names = local.dns_names service = local.service diff --git a/apps/traefik-ui/index.yaml b/apps/traefik-ui/index.yaml index 7196b02..edd4c87 100644 --- a/apps/traefik-ui/index.yaml +++ b/apps/traefik-ui/index.yaml @@ -6,15 +6,15 @@ metadata: name: traefik-ui description: Access to the Traefik UI options: - domain-name: - default: your_company.com + ingress-class: + default: traefik examples: - - your_company.com + - traefik type: string - domain: - default: your-company + issuer: + default: letsencrypt-prod examples: - - your-company + - letsencrypt-prod type: string sub-domain: default: traefik @@ -26,15 +26,15 @@ options: examples: - infra type: string - ingress-class: - default: traefik + domain: + default: your-company examples: - - traefik + - your-company type: string - issuer: - default: letsencrypt-prod + domain-name: + default: your_company.com examples: - - letsencrypt-prod + - your_company.com type: string dependencies: - dist: null diff --git a/apps/traefik-ui/presentation.tf b/apps/traefik-ui/presentation.tf index 8dc0eb7..80cfd71 100644 --- a/apps/traefik-ui/presentation.tf +++ b/apps/traefik-ui/presentation.tf @@ -16,12 +16,12 @@ locals { } module "ingress" { - source = "/dist/modules/ingress" + source = "git::https://git.solidite.fr/vynil/kydah-modules.git//ingress" component = "" instance = var.instance namespace = var.namespace issuer = var.issuer - ingress-class = var.ingress-class + ingress_class = var.ingress-class labels = local.common-labels dns_names = local.dns_names middlewares = ["forward-${local.app_name}"] @@ -32,10 +32,10 @@ module "ingress" { } module "application" { - source = "/dist/modules/application" + source = "git::https://git.solidite.fr/vynil/kydah-modules.git//application" component = var.component instance = var.instance - app-group = var.app-group + app_group = var.app-group dns_name = local.dns_name icon = local.icon protocol_provider = module.forward.provider-id @@ -55,12 +55,12 @@ provider "restapi" { } module "forward" { - source = "/dist/modules/forward" + source = "git::https://git.solidite.fr/vynil/kydah-modules.git//forward" component = var.component instance = var.instance domain = var.domain namespace = var.namespace - ingress-class = var.ingress-class + ingress_class = var.ingress-class labels = local.common-labels dns_names = local.dns_names service = local.service diff --git a/apps/woodpecker/index.yaml b/apps/woodpecker/index.yaml index d1fd7f8..71737b6 100644 --- a/apps/woodpecker/index.yaml +++ b/apps/woodpecker/index.yaml @@ -6,11 +6,6 @@ metadata: name: woodpecker description: null options: - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string storage-agent: default: size: 10Gi @@ -31,6 +26,16 @@ options: default: 'false' type: string type: object + sub-domain: + default: ci + examples: + - ci + type: string + app-group: + default: dev + examples: + - dev + type: string timeouts: default: default: '60' @@ -46,6 +51,26 @@ options: default: '120' type: string type: object + domain-name: + default: your_company.com + examples: + - your_company.com + type: string + domain: + default: your-company + examples: + - your-company + type: string + ingress-class: + default: traefik + examples: + - traefik + type: string + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string images: default: agent: @@ -143,26 +168,6 @@ options: type: string type: object type: object - sub-domain: - default: ci - examples: - - ci - type: string - domain: - default: your-company - examples: - - your-company - type: string - admin-users: - default: woodpecker,admin - examples: - - woodpecker,admin - type: string - app-group: - default: dev - examples: - - dev - type: string storage-server: default: accessMode: ReadWriteOnce @@ -182,15 +187,10 @@ options: default: 10Gi type: string type: object - ingress-class: - default: traefik + admin-users: + default: woodpecker,admin examples: - - traefik - type: string - domain-name: - default: your_company.com - examples: - - your_company.com + - woodpecker,admin type: string dependencies: - dist: null diff --git a/apps/woodpecker/presentation.tf b/apps/woodpecker/presentation.tf index 098486e..4017764 100644 --- a/apps/woodpecker/presentation.tf +++ b/apps/woodpecker/presentation.tf @@ -11,12 +11,12 @@ locals { } module "ingress" { - source = "/dist/modules/ingress" + source = "git::https://git.solidite.fr/vynil/kydah-modules.git//ingress" component = "" instance = var.instance namespace = var.namespace issuer = var.issuer - ingress-class = var.ingress-class + ingress_class = var.ingress-class labels = local.common-labels dns_names = local.dns_names middlewares = [] @@ -27,10 +27,10 @@ module "ingress" { } module "application" { - source = "/dist/modules/application" + source = "git::https://git.solidite.fr/vynil/kydah-modules.git//application" component = var.component instance = var.instance - app-group = var.app-group + app_group = var.app-group dns_name = local.dns_name icon = local.icon providers = { diff --git a/monitor/alertmanager/index.yaml b/monitor/alertmanager/index.yaml index cc25619..750b805 100644 --- a/monitor/alertmanager/index.yaml +++ b/monitor/alertmanager/index.yaml @@ -6,56 +6,16 @@ metadata: name: alertmanager description: null options: - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string - logLevel: - default: info - examples: - - info - type: string ingress-class: default: traefik examples: - traefik type: string - retention: - default: 120h - examples: - - 120h - type: string app-group: default: monitor examples: - monitor type: string - domain-name: - default: your_company.com - examples: - - your_company.com - type: string - domain: - default: your-company - examples: - - your-company - type: string - replicas: - default: 1 - examples: - - 1 - type: integer - listenLocal: - default: false - examples: - - false - type: boolean - sub-domain: - default: alertmanager - examples: - - alertmanager - type: string images: default: alertmanager: @@ -95,6 +55,46 @@ options: type: string type: object type: object + retention: + default: 120h + examples: + - 120h + type: string + sub-domain: + default: alertmanager + examples: + - alertmanager + type: string + domain: + default: your-company + examples: + - your-company + type: string + replicas: + default: 1 + examples: + - 1 + type: integer + logLevel: + default: info + examples: + - info + type: string + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string + domain-name: + default: your_company.com + examples: + - your_company.com + type: string + listenLocal: + default: false + examples: + - false + type: boolean dependencies: - dist: null category: share diff --git a/monitor/alertmanager/presentation.tf b/monitor/alertmanager/presentation.tf index 7564066..81f61fc 100644 --- a/monitor/alertmanager/presentation.tf +++ b/monitor/alertmanager/presentation.tf @@ -35,7 +35,7 @@ module "application" { source = "git::https://git.solidite.fr/vynil/kydah-modules.git//application" component = var.component instance = var.instance - app-group = var.app-group + app_group = var.app-group dns_name = local.dns_name icon = local.icon protocol_provider = module.forward.provider-id @@ -60,7 +60,7 @@ module "forward" { instance = var.instance domain = var.domain namespace = var.namespace - ingress-class = var.ingress-class + ingress_class = var.ingress-class labels = local.common-labels dns_names = local.dns_names service = local.service diff --git a/monitor/grafana/index.yaml b/monitor/grafana/index.yaml index b6f1484..bfa0bc6 100644 --- a/monitor/grafana/index.yaml +++ b/monitor/grafana/index.yaml @@ -6,6 +6,11 @@ metadata: name: grafana description: null options: + domain: + default: your-company + examples: + - your-company + type: string images: default: busybox: @@ -103,6 +108,21 @@ options: type: string type: object type: object + ingress-class: + default: traefik + examples: + - traefik + type: string + app-group: + default: monitor + examples: + - monitor + type: string + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string sub-domain: default: grafana examples: @@ -113,31 +133,6 @@ options: examples: - your_company.com type: string - app-group: - default: monitor - examples: - - monitor - type: string - domain: - default: your-company - examples: - - your-company - type: string - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string - admin_name: - default: grafana_admin - examples: - - grafana_admin - type: string - ingress-class: - default: traefik - examples: - - traefik - type: string storage: default: volume: @@ -175,6 +170,11 @@ options: type: string type: object type: object + admin_name: + default: grafana_admin + examples: + - grafana_admin + type: string dependencies: [] providers: kubernetes: true diff --git a/monitor/grafana/presentation.tf b/monitor/grafana/presentation.tf index f4d70ba..3ec7117 100644 --- a/monitor/grafana/presentation.tf +++ b/monitor/grafana/presentation.tf @@ -21,7 +21,7 @@ module "ingress" { instance = var.instance namespace = var.namespace issuer = var.issuer - ingress-class = var.ingress-class + ingress_class = var.ingress-class labels = local.common-labels dns_names = local.dns_names middlewares = [] @@ -35,7 +35,7 @@ module "ingress" { source = "git::https://git.solidite.fr/vynil/kydah-modules.git//application" component = var.component instance = var.instance - app-group = var.app-group + app_group = var.app-group dns_name = local.dns_name icon = local.icon sub_groups = ["admin"] diff --git a/monitor/prometheus/index.yaml b/monitor/prometheus/index.yaml index 57d06e8..4f33a28 100644 --- a/monitor/prometheus/index.yaml +++ b/monitor/prometheus/index.yaml @@ -6,65 +6,35 @@ metadata: name: prometheus description: null options: - ingress-class: - default: traefik - examples: - - traefik - type: string - domain: - default: your-company - examples: - - your-company - type: string - app-group: - default: monitor - examples: - - monitor - type: string - domain-name: - default: your_company.com - examples: - - your_company.com - type: string - retention: - default: 10d - examples: - - 10d - type: string replicas: default: 1 examples: - 1 type: integer - shards: - default: 1 + logLevel: + default: info examples: - - 1 - type: integer - enableAdminAPI: - default: false - examples: - - false - type: boolean - alertmanager: - default: alertmanager-alertmanager - examples: - - alertmanager-alertmanager + - info type: string listenLocal: default: false examples: - false type: boolean - sub-domain: - default: prometheus + domain: + default: your-company examples: - - prometheus + - your-company type: string - logLevel: - default: info + retention: + default: 10d examples: - - info + - 10d + type: string + alertmanager: + default: alertmanager-alertmanager + examples: + - alertmanager-alertmanager type: string images: default: @@ -105,11 +75,41 @@ options: type: string type: object type: object + enableAdminAPI: + default: false + examples: + - false + type: boolean + domain-name: + default: your_company.com + examples: + - your_company.com + type: string + sub-domain: + default: prometheus + examples: + - prometheus + type: string + app-group: + default: monitor + examples: + - monitor + type: string + shards: + default: 1 + examples: + - 1 + type: integer issuer: default: letsencrypt-prod examples: - letsencrypt-prod type: string + ingress-class: + default: traefik + examples: + - traefik + type: string dependencies: - dist: null category: share diff --git a/monitor/prometheus/presentation.tf b/monitor/prometheus/presentation.tf index 8bafcf3..ec3a2ca 100644 --- a/monitor/prometheus/presentation.tf +++ b/monitor/prometheus/presentation.tf @@ -21,7 +21,7 @@ module "ingress" { instance = var.instance namespace = var.namespace issuer = var.issuer - ingress-class = var.ingress-class + ingress_class = var.ingress-class labels = local.common-labels dns_names = local.dns_names middlewares = ["forward-${local.app_name}"] @@ -35,7 +35,7 @@ module "application" { source = "git::https://git.solidite.fr/vynil/kydah-modules.git//application" component = var.component instance = var.instance - app-group = var.app-group + app_group = var.app-group dns_name = local.dns_name icon = local.icon protocol_provider = module.forward.provider-id @@ -60,7 +60,7 @@ module "forward" { instance = var.instance domain = var.domain namespace = var.namespace - ingress-class = var.ingress-class + ingress_class = var.ingress-class labels = local.common-labels dns_names = local.dns_names service = local.service