fix

meta/domain-auth/index.yaml

@@ -21,6 +21,8 @@ options:
         default: true
         type: boolean
     type: object
+    x-vynil-category: share
+    x-vynil-package: authentik
   authentik-forward:
     default:
       enable: false
@@ -31,6 +33,8 @@ options:
         default: false
         type: boolean
     type: object
+    x-vynil-category: share
+    x-vynil-package: authentik-forward
   authentik-ldap:
     default:
       enable: false
@@ -41,6 +45,8 @@ options:
         default: false
         type: boolean
     type: object
+    x-vynil-category: share
+    x-vynil-package: authentik-ldap
   backups:
     default:
       enable: false

meta/domain-mail/index.yaml

@@ -134,6 +134,8 @@ options:
         default: true
         type: boolean
     type: object
+    x-vynil-category: share
+    x-vynil-package: wildduck
 dependencies: []
 providers:
   kubernetes: true

share/wildduck/application.tf

@@ -12,7 +12,7 @@ resource "authentik_group" "groups" {
 
 resource "authentik_application" "prj_app" {
   name              = "${var.instance}"
-  slug              = "${var.component}-${var.instance}"
+  slug              = "${var.instance}-${var.component}"
   #protocol_provider = authentik_provider_oauth2.oauth2.id
   group             = var.app_group
   backchannel_providers = [authentik_provider_scim.scim.id]

share/wildduck/common.tf

@@ -0,0 +1,12 @@
+
+locals {
+  common_labels = {
+    "vynil.solidite.fr/owner-name" = var.instance
+    "vynil.solidite.fr/owner-namespace" = var.namespace
+    "vynil.solidite.fr/owner-category" = var.category
+    "vynil.solidite.fr/owner-component" = var.component
+    "app.kubernetes.io/managed-by" = "vynil"
+    "app.kubernetes.io/name" = var.component
+    "app.kubernetes.io/instance" = var.instance
+  }
+}

share/wildduck/index.yaml

@@ -6,6 +6,56 @@ metadata:
   name: wildduck
   description: null
 options:
+  additional-domains:
+    default: []
+    items:
+      type: string
+    type: array
+  app_group:
+    default: ''
+    examples:
+    - ''
+    type: string
+  backups:
+    default:
+      enable: false
+      endpoint: ''
+      key-id-key: s3-id
+      secret-key: s3-secret
+      secret-name: backup-settings
+    examples:
+    - enable: false
+      endpoint: ''
+      key-id-key: s3-id
+      secret-key: s3-secret
+      secret-name: backup-settings
+    properties:
+      enable:
+        default: false
+        type: boolean
+      endpoint:
+        default: ''
+        type: string
+      key-id-key:
+        default: s3-id
+        type: string
+      secret-key:
+        default: s3-secret
+        type: string
+      secret-name:
+        default: backup-settings
+        type: string
+    type: object
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  domain_name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
   images:
     default:
       haraka:
@@ -283,61 +333,43 @@ options:
             type: string
         type: object
     type: object
-  domain:
+  ingress_class:
-    default: your-company
+    default: traefik
     examples:
-    - your-company
+    - traefik
-    type: string
-  domain_name:
-    default: your_company.com
-    examples:
-    - your_company.com
     type: string
   issuer:
     default: letsencrypt-prod
     examples:
     - letsencrypt-prod
     type: string
-  app_group:
+  mongo:
-    default: ''
-    examples:
-    - ''
-    type: string
-  backups:
     default:
-      enable: false
+      version: 6.0.13
-      endpoint: ''
-      key-id-key: s3-id
-      secret-key: s3-secret
-      secret-name: backup-settings
     examples:
-    - enable: false
+    - version: 6.0.13
-      endpoint: ''
-      key-id-key: s3-id
-      secret-key: s3-secret
-      secret-name: backup-settings
     properties:
-      enable:
+      version:
-        default: false
+        default: 6.0.13
-        type: boolean
-      endpoint:
-        default: ''
-        type: string
-      key-id-key:
-        default: s3-id
-        type: string
-      secret-key:
-        default: s3-secret
-        type: string
-      secret-name:
-        default: backup-settings
         type: string
     type: object
-  ingress_class:
+  redis:
-    default: traefik
+    default:
+      exporter:
+        enabled: true
     examples:
-    - traefik
+    - exporter:
-    type: string
+        enabled: true
+    properties:
+      exporter:
+        default:
+          enabled: true
+        properties:
+          enabled:
+            default: true
+            type: boolean
+        type: object
+    type: object
   storage:
     default:
       redis:
@@ -360,28 +392,6 @@ options:
     examples:
     - mail
     type: string
-  redis:
-    default:
-      exporter:
-        enabled: true
-    examples:
-    - exporter:
-        enabled: true
-    properties:
-      exporter:
-        default:
-          enabled: true
-        properties:
-          enabled:
-            default: true
-            type: boolean
-        type: object
-    type: object
-  additional-domains:
-    default: []
-    items:
-      type: string
-    type: array
 dependencies:
 - dist: null
   category: dbo

share/wildduck/mongo.tf

@@ -40,7 +40,7 @@ resource "kubectl_manifest" "prj_mongo" {
     spec:
       members: 1
       type: ReplicaSet
-      version: "7.0.2"
+      version: "${var.mongo.version}"
       statefulSet:
         spec:
           template:

share/wildduck/redis.tf

@@ -5,7 +5,7 @@ locals {
 }
 resource "kubectl_manifest" "prj_redis" {
   yaml_body  = <<-EOF
-    apiVersion: "redis.redis.opstreelabs.in/v1beta1"
+    apiVersion: "redis.redis.opstreelabs.in/v1beta2"
     kind: "Redis"
     metadata:
       name: "${var.instance}-${var.component}-redis"
@@ -25,7 +25,7 @@ resource "kubectl_manifest" "prj_redis" {
       redisExporter:
         enabled: ${var.redis.exporter.enabled}
         image: "${var.images.redis_exporter.registry}/${var.images.redis_exporter.repository}:${var.images.redis_exporter.tag}"
-      securityContext:
+      podSecurityContext:
         runAsUser: 1000
         fsGroup: 1000
   EOF

share/wildduck/scim.tf

@@ -14,7 +14,7 @@ data "authentik_property_mapping_scim" "group" {
 }
 
 resource "authentik_provider_scim" "scim" {
-  name                    = "${var.component}-${var.instance}-scim"
+  name                    = "${var.instance}-${var.component}-scim"
   url                     = "http://${var.instance}-scimgateway.${var.namespace}.svc.cluster.local/scim"
   token                   = local.secrets.authentik
   property_mappings       = [data.authentik_property_mapping_scim.user.id]