From 85230c148139fdea959d681ece0371fad717c974 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Huss?= <sebastien.huss@gmail.com>
Date: Fri, 28 Jul 2023 18:33:04 +0200
Subject: [PATCH] fix

---
 apps/nextcloud/index.yaml    | 196 +++++++++++++++++------------------
 apps/nextcloud/onlyoffice.tf |   1 +
 2 files changed, 99 insertions(+), 98 deletions(-)

diff --git a/apps/nextcloud/index.yaml b/apps/nextcloud/index.yaml
index 4af813b..c94e5d7 100644
--- a/apps/nextcloud/index.yaml
+++ b/apps/nextcloud/index.yaml
@@ -6,59 +6,81 @@ metadata:
   name: nextcloud
   description: null
 options:
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  redis:
+  apps:
     default:
-      exporter:
-        enabled: true
-        image: quay.io/opstree/redis-exporter:v1.44.0
-      image: quay.io/opstree/redis:v7.0.5
-      storage: 2Gi
+      calendar: false
+      collabora: false
+      contacts: false
+      deck: false
+      groupfolders: true
+      notes: false
+      onlyoffice: false
+      spreed: false
+      tasks: false
     examples:
-    - exporter:
-        enabled: true
-        image: quay.io/opstree/redis-exporter:v1.44.0
-      image: quay.io/opstree/redis:v7.0.5
-      storage: 2Gi
+    - calendar: false
+      collabora: false
+      contacts: false
+      deck: false
+      groupfolders: true
+      notes: false
+      onlyoffice: false
+      spreed: false
+      tasks: false
     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
+      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
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
   sub-domain:
     default: files
     examples:
     - files
     type: string
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
   issuer:
     default: letsencrypt-prod
     examples:
     - letsencrypt-prod
     type: string
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
   images:
     default:
       collabora:
@@ -222,11 +244,39 @@ options:
             type: string
         type: object
     type: object
-  domain:
-    default: your-company
+  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:
-    - your-company
-    type: string
+    - 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
   postgres:
     default:
       replicas: 1
@@ -286,6 +336,11 @@ options:
         default: 1
         type: integer
     type: object
+  openid-name:
+    default: vynil
+    examples:
+    - vynil
+    type: string
   admin:
     default:
       name: nextcloud_admin
@@ -296,61 +351,6 @@ options:
         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
 dependencies: []
 providers:
   kubernetes: true
diff --git a/apps/nextcloud/onlyoffice.tf b/apps/nextcloud/onlyoffice.tf
index 76aab38..0e05de4 100644
--- a/apps/nextcloud/onlyoffice.tf
+++ b/apps/nextcloud/onlyoffice.tf
@@ -31,6 +31,7 @@ resource "kubectl_manifest" "onlyoffice_deploy" {
     kind: Deployment
     metadata:
       name: "${var.instance}-onlyoffice"
+      namespace: "${var.namespace}"
       labels: ${jsonencode(local.onlyoffice-labels)}
     spec:
       replicas: 1