fix

meta/domain-apps/apps.tf

@@ -1,4 +1,8 @@
 locals {
+    annotations = {
+      "vynil.solidite.fr/meta"   = var.component
+      "vynil.solidite.fr/name"   = var.namespace
+    }
     annotations_default = {
       "default.vynil.solidite.fr/sso_vynil" = var.sso_vynil
       "default.vynil.solidite.fr/domain_name" = var.domain_name
@@ -42,9 +46,9 @@ locals {
       "class"      = var.storage.volume.class
     }
     nextcloud = merge(local.global,{ for k, v in var.nextcloud : k => v if !contains(["enable","storage","backups"],k) },{
-      backups = merge(lookup(var.nextcloud, "backups", {}), local.global-backups)
+      backups = merge(local.global-backups, lookup(var.nextcloud, "backups", {}))
       storage = merge({ for k, v in lookup(var.nextcloud, "storage", {}) : k => v if !contains(["volume"],k) }, {
-        volume = lookup(lookup(var.nextcloud, "storage", {}), "volume", local.global-volume)
+        volume = lookup(local.global-volume, lookup(var.nextcloud, "storage", {}), "volume")
       })
     })
 }
@@ -52,8 +56,8 @@ locals {
 resource "kubernetes_namespace_v1" "files-ns" {
   count = var.nextcloud.enable ? 1 : 0
   metadata {
-    annotations = local.annotations_default
-    labels = local.common-labels
+    annotations = merge(local.annotations, local.annotations_default)
+    labels = merge(local.common-labels, local.annotations)
     name = "${var.namespace}-files"
   }
 }

meta/domain-apps/index.yaml

@@ -6,27 +6,10 @@ metadata:
   name: domain-apps
   description: null
 options:
-  nextcloud:
-    default:
-      enable: false
+  app_group:
+    default: apps
     examples:
-    - enable: false
-    properties:
-      enable:
-        default: false
-        type: boolean
-    type: object
-    x-vynil-category: apps
-    x-vynil-package: nextcloud
-  language:
-    default: fr_FR
-    examples:
-    - fr_FR
-    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
+    - apps
     type: string
   backups:
     default:
@@ -68,31 +51,6 @@ options:
         default: false
         type: boolean
     type: object
-  timezone:
-    default: Europe/Paris
-    examples:
-    - Europe/Paris
-    type: string
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  ingress_class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  sso_vynil:
-    default: true
-    examples:
-    - true
-    type: boolean
-  domain_name:
-    default: your-company.com
-    examples:
-    - your-company.com
-    type: string
   distributions:
     default:
       core: core
@@ -108,11 +66,48 @@ options:
         default: domain
         type: string
     type: object
-  app_group:
-    default: apps
+  domain:
+    default: your-company
     examples:
-    - apps
+    - your-company
     type: string
+  domain_name:
+    default: your-company.com
+    examples:
+    - your-company.com
+    type: string
+  ingress_class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  language:
+    default: fr_FR
+    examples:
+    - fr_FR
+    type: string
+  nextcloud:
+    default:
+      enable: false
+    examples:
+    - enable: false
+    properties:
+      enable:
+        default: false
+        type: boolean
+    type: object
+    x-vynil-category: apps
+    x-vynil-package: nextcloud
+  sso_vynil:
+    default: true
+    examples:
+    - true
+    type: boolean
   storage:
     default:
       volume:
@@ -136,6 +131,11 @@ options:
             type: string
         type: object
     type: object
+  timezone:
+    default: Europe/Paris
+    examples:
+    - Europe/Paris
+    type: string
 dependencies: []
 providers:
   kubernetes: true