fix

apps/nextcloud/datas.tf

@@ -53,7 +53,7 @@ data "kustomization_overlay" "data" {
                 secretName: "${var.instance}-cert"
             - name: config
               configMap:
-                name: ${kubectl_manifest.nextcloud-config.name}
+                name: "${var.component}-${var.instance}-init"
             containers:
             - name: nextcloud
               image: "${var.images.nextcloud.registry}/${var.images.nextcloud.repository}:${var.images.nextcloud.tag}"

apps/nextcloud/index.yaml

@@ -25,6 +25,39 @@ options:
         default: 10Gi
         type: string
     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
   admin:
     default:
       name: nextcloud_admin
@@ -35,106 +68,6 @@ options:
         default: nextcloud_admin
         type: string
     type: object
-  apps:
-    default:
-      calendar: false
-      contacts: false
-      deck: false
-      groupfolders: true
-      notes: false
-      spreed: false
-      tasks: false
-    examples:
-    - calendar: false
-      contacts: false
-      deck: false
-      groupfolders: true
-      notes: false
-      spreed: false
-      tasks: false
-    properties:
-      calendar:
-        default: false
-        type: boolean
-      contacts:
-        default: false
-        type: boolean
-      deck:
-        default: false
-        type: boolean
-      groupfolders:
-        default: true
-        type: boolean
-      notes:
-        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
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    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
-  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
   images:
     default:
       exporter:
@@ -238,39 +171,11 @@ options:
             type: string
         type: object
     type: object
-  redis:
+  issuer:
-    default:
+    default: letsencrypt-prod
-      exporter:
-        enabled: true
-        image: quay.io/opstree/redis-exporter:v1.44.0
-      image: quay.io/opstree/redis:v7.0.5
-      storage: 2Gi
     examples:
-    - exporter:
+    - letsencrypt-prod
-        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: cloud
     examples:
@@ -281,6 +186,101 @@ options:
     examples:
     - vynil
     type: string
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  apps:
+    default:
+      calendar: false
+      contacts: false
+      deck: false
+      groupfolders: true
+      notes: false
+      spreed: false
+      tasks: false
+    examples:
+    - calendar: false
+      contacts: false
+      deck: false
+      groupfolders: true
+      notes: false
+      spreed: false
+      tasks: false
+    properties:
+      calendar:
+        default: false
+        type: boolean
+      contacts:
+        default: false
+        type: boolean
+      deck:
+        default: false
+        type: boolean
+      groupfolders:
+        default: true
+        type: boolean
+      notes:
+        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
+  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
 dependencies: []
 providers:
   kubernetes: true

share/dns/config.tf

@@ -14,7 +14,6 @@ locals {
         log . {combined} {
             class denial error
         }
-        kubernetes cluster.local
         prometheus 0.0.0.0:9153
         forward . ${var.forward}
         cache 30

share/dns/index.yaml

@@ -6,6 +6,26 @@ metadata:
   name: dns
   description: null
 options:
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  sub-domain:
+    default: dns
+    examples:
+    - dns
+    type: string
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  forward:
+    default: 192.168.1.254
+    examples:
+    - 192.168.1.254
+    type: string
   image:
     default:
       pullPolicy: IfNotPresent
@@ -35,21 +55,6 @@ options:
         default: 1.10.1
         type: string
     type: object
-  sub-domain:
-    default: dns
-    examples:
-    - dns
-    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  forward:
-    default: 192.168.1.254
-    examples:
-    - 192.168.1.254
-    type: string
   zones:
     default: []
     items:
@@ -74,11 +79,6 @@ options:
           type: string
       type: object
     type: array
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
 dependencies: []
 providers:
   kubernetes: true