fix

2024-01-26 09:12:40 +01:00
parent 24f6e33d21
commit db07be70a0
14 changed files with 974 additions and 643 deletions
--- a/share/wildduck/index.yaml
+++ b/share/wildduck/index.yaml
@@ -6,41 +6,11 @@ metadata:
  name: wildduck
  description: null
 options:
-  ingress_class:
-    default: traefik
+  app_group:
+    default: ''
    examples:
-    - traefik
+    - ''
    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
  images:
    default:
      haraka:
@@ -48,6 +18,16 @@ options:
        registry: docker.io
        repository: sebt3/wildduck-haraka
        tag: 3.0.2
+      redis:
+        pullPolicy: IfNotPresent
+        registry: quay.io
+        repository: opstree/redis
+        tag: v7.0.12
+      redis_exporter:
+        pullPolicy: IfNotPresent
+        registry: quay.io
+        repository: opstree/redis-exporter
+        tag: v1.44.0
      rspamd:
        pullPolicy: IfNotPresent
        registry: docker.io
@@ -79,6 +59,16 @@ options:
        registry: docker.io
        repository: sebt3/wildduck-haraka
        tag: 3.0.2
+      redis:
+        pullPolicy: IfNotPresent
+        registry: quay.io
+        repository: opstree/redis
+        tag: v7.0.12
+      redis_exporter:
+        pullPolicy: IfNotPresent
+        registry: quay.io
+        repository: opstree/redis-exporter
+        tag: v1.44.0
      rspamd:
        pullPolicy: IfNotPresent
        registry: docker.io
@@ -129,6 +119,54 @@ options:
            default: 3.0.2
            type: string
        type: object
+      redis:
+        default:
+          pullPolicy: IfNotPresent
+          registry: quay.io
+          repository: opstree/redis
+          tag: v7.0.12
+        properties:
+          pullPolicy:
+            default: IfNotPresent
+            enum:
+            - Always
+            - Never
+            - IfNotPresent
+            type: string
+          registry:
+            default: quay.io
+            type: string
+          repository:
+            default: opstree/redis
+            type: string
+          tag:
+            default: v7.0.12
+            type: string
+        type: object
+      redis_exporter:
+        default:
+          pullPolicy: IfNotPresent
+          registry: quay.io
+          repository: opstree/redis-exporter
+          tag: v1.44.0
+        properties:
+          pullPolicy:
+            default: IfNotPresent
+            enum:
+            - Always
+            - Never
+            - IfNotPresent
+            type: string
+          registry:
+            default: quay.io
+            type: string
+          repository:
+            default: opstree/redis-exporter
+            type: string
+          tag:
+            default: v1.44.0
+            type: string
+        type: object
      rspamd:
        default:
          pullPolicy: IfNotPresent
@@ -250,54 +288,90 @@ options:
            type: string
        type: object
    type: object
-  domain:
-    default: your-company
+  sub_domain:
+    default: mail
    examples:
-    - your-company
-    type: string
-  app_group:
-    default: ''
-    examples:
-    - ''
+    - mail
    type: string
  additional-domains:
    default: []
    items:
      type: string
    type: array
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
  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: object
+    type: object
+  storage:
+    default:
+      redis:
+        size: 2Gi
+    examples:
+    - redis:
+        size: 2Gi
+    properties:
+      redis:
+        default:
+          size: 2Gi
+        properties:
+          size:
+            default: 2Gi
            type: string
        type: object
-      image:
-        default: quay.io/opstree/redis:v7.0.5
+    type: object
+  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
-      storage:
-        default: 2Gi
+      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:
+    default: traefik
+    examples:
+    - traefik
+    type: string
  domain_name:
    default: your_company.com
    examples:
@@ -308,11 +382,6 @@ options:
    examples:
    - letsencrypt-prod
    type: string
-  sub_domain:
-    default: mail
-    examples:
-    - mail
-    type: string
 dependencies:
 - dist: null
  category: dbo
@@ -330,4 +399,5 @@ providers:
  postgresql: null
  restapi: true
  http: null
+  gitea: null
 tfaddtype: null
--- a/share/wildduck/mongo.tf
+++ b/share/wildduck/mongo.tf
@@ -40,7 +40,7 @@ resource "kubectl_manifest" "prj_mongo" {
    spec:
      members: 1
      type: ReplicaSet
-      version: "4.4.0"
+      version: "7.0.2"
      statefulSet:
        spec:
          template:
--- a/share/wildduck/redis.tf
+++ b/share/wildduck/redis.tf
@@ -14,7 +14,7 @@ resource "kubectl_manifest" "prj_redis" {
    spec:
      kubernetesConfig:
        image: "${var.images.redis.registry}/${var.images.redis.repository}:${var.images.redis.tag}"
-        imagePullPolicy: "IfNotPresent"
+        imagePullPolicy: "${var.images.redis.pullPolicy}"
      storage:
        volumeClaimTemplate:
          spec: