From d40b617035fd103030773a6f450658c453356718 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Fri, 28 Jul 2023 18:20:33 +0200 Subject: [PATCH] fix --- apps/nextcloud/collabora.tf | 2 +- apps/nextcloud/index.yaml | 292 +++++++++++++++++------------------ apps/nextcloud/onlyoffice.tf | 2 +- 3 files changed, 148 insertions(+), 148 deletions(-) diff --git a/apps/nextcloud/collabora.tf b/apps/nextcloud/collabora.tf index 0d0f283..4ef7a7b 100644 --- a/apps/nextcloud/collabora.tf +++ b/apps/nextcloud/collabora.tf @@ -2,7 +2,7 @@ locals { collabora-labels = merge(local.common-labels, { "app.kubernetes.io/component" = "collabora" }) - dns-collabora = "collabora.${local.dns-names}" + dns-collabora = "collabora.${local.dns-name}" collabora-middlewares = ["${var.instance}-https"] collabora-service = { "name" = "${var.instance}-collabora" diff --git a/apps/nextcloud/index.yaml b/apps/nextcloud/index.yaml index 2a72235..adfdbb1 100644 --- a/apps/nextcloud/index.yaml +++ b/apps/nextcloud/index.yaml @@ -6,148 +6,20 @@ metadata: name: nextcloud description: null options: - hpa: - default: - avg-cpu: 50 - max-replicas: 5 - min-replicas: 1 + domain-name: + default: your_company.com 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 - admin: - default: - name: nextcloud_admin - examples: - - name: nextcloud_admin - properties: - name: - default: nextcloud_admin - type: string - type: object - sub-domain: - default: files - examples: - - files + - your_company.com type: string domain: default: your-company examples: - your-company type: string - ingress-class: - default: traefik + sub-domain: + default: files examples: - - traefik - type: string - apps: - default: - calendar: false - collabora: false - contacts: false - deck: false - groupfolders: true - notes: false - onlyoffice: false - spreed: false - tasks: false - examples: - - calendar: false - collabora: false - contacts: false - deck: false - groupfolders: true - notes: false - onlyoffice: false - spreed: false - tasks: false - properties: - 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 - notes: - default: false - type: boolean - onlyoffice: - default: false - type: boolean - spreed: - default: false - type: boolean - tasks: - default: false - type: boolean - type: object - 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 - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string - openid-name: - default: vynil - examples: - - vynil + - files type: string images: default: @@ -312,24 +184,62 @@ options: type: string type: object type: object - postgres: + hpa: default: - replicas: 1 - storage: 5Gi - version: '14' + avg-cpu: 50 + max-replicas: 5 + min-replicas: 1 examples: - - replicas: 1 - storage: 5Gi - version: '14' + - avg-cpu: 50 + max-replicas: 5 + min-replicas: 1 properties: - replicas: + avg-cpu: + default: 50 + type: integer + max-replicas: + default: 5 + type: integer + min-replicas: default: 1 type: integer - storage: - default: 5Gi + 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 - version: - default: '14' + storage: + default: 2Gi type: string type: object storage: @@ -351,6 +261,96 @@ options: default: 10Gi type: string type: object + admin: + default: + name: nextcloud_admin + examples: + - name: nextcloud_admin + properties: + name: + default: nextcloud_admin + type: string + type: object + apps: + default: + calendar: false + collabora: false + contacts: false + deck: false + groupfolders: true + notes: false + onlyoffice: false + spreed: false + tasks: false + examples: + - calendar: false + collabora: false + contacts: false + deck: false + groupfolders: true + notes: false + onlyoffice: false + spreed: false + tasks: false + properties: + 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 + notes: + default: false + type: boolean + onlyoffice: + default: false + type: boolean + spreed: + default: false + type: boolean + tasks: + default: false + type: boolean + 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 + ingress-class: + default: traefik + examples: + - traefik + type: string + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string dependencies: [] providers: kubernetes: true diff --git a/apps/nextcloud/onlyoffice.tf b/apps/nextcloud/onlyoffice.tf index 93ee467..76aab38 100644 --- a/apps/nextcloud/onlyoffice.tf +++ b/apps/nextcloud/onlyoffice.tf @@ -2,7 +2,7 @@ locals { onlyoffice-labels = merge(local.common-labels, { "app.kubernetes.io/component" = "onlyoffice" }) - dns-onlyoffice = "onlyoffice.${local.dns-names}" + dns-onlyoffice = "onlyoffice.${local.dns-name}" onlyoffice-middlewares = ["${var.instance}-https"] onlyoffice-service = { "name" = "${var.instance}-onlyoffice"