fix

share/wildduck/index.yaml

@@ -6,93 +6,15 @@ metadata:
   name: wildduck
   description: null
 options:
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  sub-domain:
-    default: mail
-    examples:
-    - mail
-    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    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
   additional-domains:
     default: []
     items:
       type: string
     type: array
-  redis:
+  domain:
-    default:
+    default: your-company
-      exporter:
-        enabled: true
-        image: quay.io/opstree/redis-exporter:v1.44.0
-      image: quay.io/opstree/redis:v7.0.5
-      storage: 2Gi
     examples:
-    - exporter:
+    - your-company
-        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
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
     type: string
   images:
     default:
@@ -303,11 +225,89 @@ options:
             type: string
         type: object
     type: object
+  sub-domain:
+    default: mail
+    examples:
+    - mail
+    type: string
+  ingress-class:
+    default: traefik
+    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
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
   issuer:
     default: letsencrypt-prod
     examples:
     - letsencrypt-prod
     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: string
+        type: object
+      image:
+        default: quay.io/opstree/redis:v7.0.5
+        type: string
+      storage:
+        default: 2Gi
+        type: string
+    type: object
 dependencies:
 - dist: null
   category: dbo

share/wildduck/scimgateway.tf

@@ -39,12 +39,12 @@ resource "kubectl_manifest" "scimgateway_deploy" {
               protocol: TCP
             livenessProbe:
               httpGet:
-                path: /healthcheck
+                path: /ping
                 port: http
                 scheme: HTTP
             readinessProbe:
               httpGet:
-                path: /healthcheck
+                path: /ping
                 port: http
                 scheme: HTTP
             resources:
@@ -58,16 +58,6 @@ resource "kubectl_manifest" "scimgateway_deploy" {
               value: "${var.domain-name}"
             - name: "WILDDUCK_API"
               value: "${var.instance}-wildduck-api.${var.namespace}.svc"
-            - name: WILDDUCK_TOKEN
-              valueFrom:
-                secretKeyRef:
-                  name: "${var.instance}"
-                  key: authentik
-            - name: WILDDUCK_INITIAL_PASSWD
-              valueFrom:
-                secretKeyRef:
-                  name: "${var.instance}"
-                  key: default
             - name: SEED
               valueFrom:
                 secretKeyRef:
@@ -78,6 +68,16 @@ resource "kubectl_manifest" "scimgateway_deploy" {
                 secretKeyRef:
                   name: "${var.instance}"
                   key: access
+            - name: WILDDUCK_TOKEN
+              valueFrom:
+                secretKeyRef:
+                  name: "${var.instance}"
+                  key: authentik
+            - name: WILDDUCK_INITIAL_PASSWD
+              valueFrom:
+                secretKeyRef:
+                  name: "${var.instance}"
+                  key: default
   EOF
 }
 resource "kubectl_manifest" "scimgateway_service" {