From fec0ddc76c1a91af8ce77075e3b1ae5e5ee4ec04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Tue, 8 Aug 2023 10:34:55 +0200 Subject: [PATCH] fix --- apps/dolibarr/index.yaml | 220 +++++++++++----------- apps/dolibarr/postgresql.tf | 1 - apps/gitea/index.yaml | 162 ++++++++-------- apps/gitea/postgresql.tf | 1 - apps/nextcloud/index.yaml | 348 +++++++++++++++++------------------ apps/nextcloud/postgresql.tf | 1 - 6 files changed, 365 insertions(+), 368 deletions(-) diff --git a/apps/dolibarr/index.yaml b/apps/dolibarr/index.yaml index dbac1c2..4a4cc63 100644 --- a/apps/dolibarr/index.yaml +++ b/apps/dolibarr/index.yaml @@ -6,31 +6,6 @@ metadata: name: dolibarr description: null options: - 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 resources: default: limits: @@ -72,44 +47,49 @@ options: type: string type: object type: object + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string + modules: + default: + - societe + examples: + - - societe + items: + type: string + type: array domain-name: default: your_company.com examples: - your_company.com type: string - redis: - default: - exporter: - enabled: true - image: quay.io/opstree/redis-exporter:v1.44.0 - image: quay.io/opstree/redis:v7.0.5 - storage: 2Gi + log-level: + default: 5 examples: - - exporter: - enabled: true - image: quay.io/opstree/redis-exporter:v1.44.0 - image: quay.io/opstree/redis:v7.0.5 - storage: 2Gi - properties: - exporter: - default: - enabled: true - image: quay.io/opstree/redis-exporter:v1.44.0 - properties: - enabled: - default: true - type: boolean - image: - default: quay.io/opstree/redis-exporter:v1.44.0 - type: string - type: object - image: - default: quay.io/opstree/redis:v7.0.5 - type: string - storage: - default: 2Gi - type: string - type: object + - 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 + ingress-class: + default: traefik + examples: + - traefik + type: string storage: default: accessMode: ReadWriteOnce @@ -137,59 +117,6 @@ options: - block type: string type: object - ingress-class: - default: traefik - examples: - - traefik - type: string - modules: - default: - - societe - examples: - - - societe - items: - type: string - type: array - postgres: - default: - replicas: 1 - storage: 5Gi - version: '14' - examples: - - replicas: 1 - storage: 5Gi - version: '14' - properties: - replicas: - default: 1 - type: integer - storage: - default: 5Gi - type: string - version: - default: '14' - type: string - type: object - sub-domain: - default: erp - examples: - - erp - type: string - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string - domain: - default: your-company - examples: - - your-company - type: string - log-level: - default: 5 - examples: - - 5 - type: integer images: default: dolibarr: @@ -255,6 +182,16 @@ options: type: string type: object type: object + parameters: + default: + MAIN_LANG_DEFAULT: auto + examples: + - MAIN_LANG_DEFAULT: auto + properties: + MAIN_LANG_DEFAULT: + default: auto + type: string + type: object hpa: default: avg-cpu: 50 @@ -275,6 +212,69 @@ options: default: 1 type: integer type: object + postgres: + default: + replicas: 1 + storage: 5Gi + version: '14' + examples: + - replicas: 1 + storage: 5Gi + version: '14' + properties: + replicas: + default: 1 + type: integer + storage: + default: 5Gi + type: string + version: + default: '14' + type: string + type: object + domain: + default: your-company + examples: + - your-company + type: string + redis: + default: + exporter: + enabled: true + image: quay.io/opstree/redis-exporter:v1.44.0 + image: quay.io/opstree/redis:v7.0.5 + storage: 2Gi + examples: + - exporter: + enabled: true + image: quay.io/opstree/redis-exporter:v1.44.0 + image: quay.io/opstree/redis:v7.0.5 + storage: 2Gi + properties: + exporter: + default: + enabled: true + image: quay.io/opstree/redis-exporter:v1.44.0 + properties: + enabled: + default: true + type: boolean + image: + default: quay.io/opstree/redis-exporter:v1.44.0 + type: string + type: object + image: + default: quay.io/opstree/redis:v7.0.5 + type: string + storage: + default: 2Gi + type: string + type: object + sub-domain: + default: erp + examples: + - erp + type: string dependencies: - dist: null category: share diff --git a/apps/dolibarr/postgresql.tf b/apps/dolibarr/postgresql.tf index 5aac0a1..1ed1f27 100644 --- a/apps/dolibarr/postgresql.tf +++ b/apps/dolibarr/postgresql.tf @@ -5,7 +5,6 @@ locals { } resource "kubectl_manifest" "prj_pg" { - depends_on = [kubectl_manifest.prj_pre_migrate_pg] yaml_body = <<-EOF apiVersion: postgresql.cnpg.io/v1 kind: Cluster diff --git a/apps/gitea/index.yaml b/apps/gitea/index.yaml index 945b364..05c1c7f 100644 --- a/apps/gitea/index.yaml +++ b/apps/gitea/index.yaml @@ -9,10 +9,60 @@ 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: - domain: - default: your-company + ssh-port: + default: 2222 examples: - - your-company + - 2222 + type: integer + ingress-class: + default: traefik + examples: + - traefik + type: string + 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 + domain-name: + default: your_company.com + examples: + - your_company.com + type: string + replicas: + default: 1 + examples: + - 1 + type: integer + volume: + default: + size: 10Gi + examples: + - size: 10Gi + properties: + size: + default: 10Gi + type: string + type: object + theme: + default: gitea-modern + examples: + - gitea-modern + type: string + default-branch: + default: main + examples: + - main type: string postgres: default: @@ -34,21 +84,6 @@ options: default: '14' 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 images: default: gitea: @@ -112,26 +147,6 @@ options: type: string type: object type: object - ingress-class: - default: traefik - examples: - - traefik - type: string - admin: - default: - email: git-admin@git.your_company.com - name: gitea_admin - examples: - - email: git-admin@git.your_company.com - name: gitea_admin - properties: - email: - default: git-admin@git.your_company.com - type: string - name: - default: gitea_admin - type: string - type: object load-balancer: default: ip: '' @@ -142,50 +157,30 @@ options: default: '' type: string type: object - disable-registration: - default: true - examples: - - true - type: boolean - volume: - default: - size: 10Gi - examples: - - size: 10Gi - properties: - size: - default: 10Gi - type: string - type: object - domain-name: - default: your_company.com - examples: - - your_company.com - type: string timezone: default: Europe/Paris examples: - Europe/Paris type: string - default-branch: - default: main + disable-registration: + default: true examples: - - main + - true + type: boolean + sub-domain: + default: git + examples: + - git type: string release: default: 8.3.0 examples: - 8.3.0 type: string - ssh-port: - default: 2222 + issuer: + default: letsencrypt-prod examples: - - 2222 - type: integer - sub-domain: - default: git - examples: - - git + - letsencrypt-prod type: string push-create: default: @@ -207,21 +202,26 @@ options: default: 'true' type: string type: object - replicas: - default: 1 + domain: + default: your-company examples: - - 1 - type: integer - theme: - default: gitea-modern - examples: - - gitea-modern + - your-company type: string - issuer: - default: letsencrypt-prod + admin: + default: + email: git-admin@git.your_company.com + name: gitea_admin examples: - - letsencrypt-prod - type: string + - email: git-admin@git.your_company.com + name: gitea_admin + properties: + email: + default: git-admin@git.your_company.com + type: string + name: + default: gitea_admin + type: string + type: object dependencies: - dist: null category: share diff --git a/apps/gitea/postgresql.tf b/apps/gitea/postgresql.tf index 5aac0a1..1ed1f27 100644 --- a/apps/gitea/postgresql.tf +++ b/apps/gitea/postgresql.tf @@ -5,7 +5,6 @@ locals { } resource "kubectl_manifest" "prj_pg" { - depends_on = [kubectl_manifest.prj_pre_migrate_pg] yaml_body = <<-EOF apiVersion: postgresql.cnpg.io/v1 kind: Cluster diff --git a/apps/nextcloud/index.yaml b/apps/nextcloud/index.yaml index ab43e2c..460b738 100644 --- a/apps/nextcloud/index.yaml +++ b/apps/nextcloud/index.yaml @@ -6,126 +6,69 @@ metadata: name: nextcloud description: null options: - postgres: + admin: default: - replicas: 1 - storage: 5Gi - version: '14' + name: nextcloud_admin examples: - - replicas: 1 - storage: 5Gi - version: '14' + - name: nextcloud_admin properties: - replicas: - default: 1 - type: integer - storage: - default: 5Gi - type: string - version: - default: '14' + name: + default: nextcloud_admin type: string type: object - ingress-class: - default: traefik + openid-name: + default: vynil examples: - - traefik + - vynil type: string + redis: + default: + exporter: + enabled: true + image: quay.io/opstree/redis-exporter:v1.44.0 + image: quay.io/opstree/redis:v7.0.5 + storage: 2Gi + examples: + - exporter: + enabled: true + image: quay.io/opstree/redis-exporter:v1.44.0 + image: quay.io/opstree/redis:v7.0.5 + storage: 2Gi + properties: + exporter: + default: + enabled: true + image: quay.io/opstree/redis-exporter:v1.44.0 + properties: + enabled: + default: true + type: boolean + image: + default: quay.io/opstree/redis-exporter:v1.44.0 + type: string + type: object + image: + default: quay.io/opstree/redis:v7.0.5 + type: string + storage: + default: 2Gi + type: string + type: object domain-name: default: your_company.com examples: - your_company.com type: string - 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 + sub-domain: + default: files 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 + - files + type: string + ingress-class: + default: traefik + examples: + - traefik + type: string images: default: collabora: @@ -289,86 +232,34 @@ options: type: string type: object type: object - openid-name: - default: vynil - examples: - - vynil - type: string - redis: - default: - exporter: - enabled: true - image: quay.io/opstree/redis-exporter:v1.44.0 - image: quay.io/opstree/redis:v7.0.5 - storage: 2Gi - examples: - - exporter: - enabled: true - image: quay.io/opstree/redis-exporter:v1.44.0 - image: quay.io/opstree/redis:v7.0.5 - storage: 2Gi - properties: - exporter: - default: - enabled: true - image: quay.io/opstree/redis-exporter:v1.44.0 - properties: - enabled: - default: true - type: boolean - image: - default: quay.io/opstree/redis-exporter:v1.44.0 - type: string - type: object - image: - default: quay.io/opstree/redis:v7.0.5 - type: string - storage: - default: 2Gi - type: string - type: object domain: default: your-company examples: - your-company type: string - storage: - default: - accessMode: ReadWriteOnce - size: 10Gi - examples: - - accessMode: ReadWriteOnce - size: 10Gi - properties: - accessMode: - default: ReadWriteOnce - enum: - - ReadWriteOnce - - ReadOnlyMany - - ReadWriteMany - type: string - size: - default: 10Gi - type: string - type: object - sub-domain: - default: files - examples: - - files - type: string issuer: default: letsencrypt-prod examples: - letsencrypt-prod type: string - admin: + postgres: default: - name: nextcloud_admin + replicas: 1 + storage: 5Gi + version: '14' examples: - - name: nextcloud_admin + - replicas: 1 + storage: 5Gi + version: '14' properties: - name: - default: nextcloud_admin + replicas: + default: 1 + type: integer + storage: + default: 5Gi + type: string + version: + default: '14' type: string type: object hpa: @@ -391,6 +282,115 @@ options: default: 1 type: integer 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 + storage: + default: + accessMode: ReadWriteOnce + size: 10Gi + examples: + - accessMode: ReadWriteOnce + size: 10Gi + properties: + accessMode: + default: ReadWriteOnce + enum: + - ReadWriteOnce + - ReadOnlyMany + - ReadWriteMany + type: string + size: + default: 10Gi + type: string + type: object dependencies: - dist: null category: share diff --git a/apps/nextcloud/postgresql.tf b/apps/nextcloud/postgresql.tf index 5aac0a1..1ed1f27 100644 --- a/apps/nextcloud/postgresql.tf +++ b/apps/nextcloud/postgresql.tf @@ -5,7 +5,6 @@ locals { } resource "kubectl_manifest" "prj_pg" { - depends_on = [kubectl_manifest.prj_pre_migrate_pg] yaml_body = <<-EOF apiVersion: postgresql.cnpg.io/v1 kind: Cluster