fix

2024-01-26 10:35:02 +01:00
parent 94e78fa7e9
commit 025be779ff
24 changed files with 1078 additions and 1078 deletions
--- 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
--- 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       = []