From 782e74cdc2066bd0a6187185d3027da1a4e6f4f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Fri, 28 Jul 2023 19:05:41 +0200 Subject: [PATCH] fix --- apps/nextcloud/collabora.tf | 2 +- apps/nextcloud/index.yaml | 266 +++++++++++++++++------------------ apps/nextcloud/onlyoffice.tf | 2 +- 3 files changed, 135 insertions(+), 135 deletions(-) diff --git a/apps/nextcloud/collabora.tf b/apps/nextcloud/collabora.tf index 6f225a1..a271256 100644 --- a/apps/nextcloud/collabora.tf +++ b/apps/nextcloud/collabora.tf @@ -136,7 +136,7 @@ resource "kubectl_manifest" "collabora_ing" { ingressClassName: "${var.ingress-class}" rules: ${jsonencode(local.collabora-rules)} tls: - - hosts: ${local.dns-collabora} + - hosts: [${local.dns-collabora}] secretName: "${var.instance}-collabora-cert" EOF } diff --git a/apps/nextcloud/index.yaml b/apps/nextcloud/index.yaml index c198d85..f34198e 100644 --- a/apps/nextcloud/index.yaml +++ b/apps/nextcloud/index.yaml @@ -6,60 +6,40 @@ metadata: name: nextcloud description: null options: - apps: + postgres: default: - calendar: false - collabora: false - contacts: false - deck: false - groupfolders: true - notes: false - onlyoffice: false - spreed: false - tasks: false + replicas: 1 + storage: 5Gi + version: '14' examples: - - calendar: false - collabora: false - contacts: false - deck: false - groupfolders: true - notes: false - onlyoffice: false - spreed: false - tasks: false + - replicas: 1 + storage: 5Gi + version: '14' 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 + replicas: + default: 1 + type: integer + storage: + default: 5Gi + type: string + version: + default: '14' + type: string type: object - openid-name: - default: vynil + issuer: + default: letsencrypt-prod examples: - - vynil + - letsencrypt-prod + type: string + ingress-class: + default: traefik + examples: + - traefik + type: string + domain-name: + default: your_company.com + examples: + - your_company.com type: string redis: default: @@ -94,80 +74,6 @@ options: default: 2Gi type: string 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 - admin: - default: - name: nextcloud_admin - examples: - - name: nextcloud_admin - properties: - name: - default: nextcloud_admin - type: string - type: object - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string - 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 - 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 domain: default: your-company examples: @@ -336,21 +242,115 @@ options: type: string type: object 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 + 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 + admin: + default: + name: nextcloud_admin + examples: + - name: nextcloud_admin + properties: + name: + default: nextcloud_admin + type: string + type: object + openid-name: + default: vynil + examples: + - vynil + 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 sub-domain: default: files examples: - files type: string - domain-name: - default: your_company.com - examples: - - your_company.com - type: string - ingress-class: - default: traefik - examples: - - traefik - type: string dependencies: [] providers: kubernetes: true diff --git a/apps/nextcloud/onlyoffice.tf b/apps/nextcloud/onlyoffice.tf index 9615bc0..0609026 100644 --- a/apps/nextcloud/onlyoffice.tf +++ b/apps/nextcloud/onlyoffice.tf @@ -136,7 +136,7 @@ resource "kubectl_manifest" "onlyoffice_ing" { ingressClassName: "${var.ingress-class}" rules: ${jsonencode(local.onlyoffice-rules)} tls: - - hosts: ${local.dns-onlyoffice} + - hosts: [${local.dns-onlyoffice}] secretName: "${var.instance}-onlyoffice-cert" EOF }