fix

apps/dbgate/index.yaml

@@ -6,106 +6,6 @@ metadata:
   name: dbgate
   description: null
 options:
-  pg:
-    default: []
-    examples:
-    - []
-    items:
-      properties:
-        dbname:
-          default: ''
-          type: string
-        name:
-          default: ''
-          type: string
-        namespace:
-          default: ''
-          type: string
-        secret:
-          properties:
-            key:
-              default: ''
-              type: string
-            name:
-              default: ''
-              type: string
-          type: object
-        username:
-          default: ''
-          type: string
-      type: object
-    type: array
-  storage:
-    default:
-      volume:
-        accessMode: ReadWriteOnce
-        size: 1Gi
-        type: Filesystem
-    description: Configure this app storage
-    examples:
-    - volume:
-        accessMode: ReadWriteOnce
-        size: 1Gi
-        type: Filesystem
-    properties:
-      volume:
-        default:
-          accessMode: ReadWriteOnce
-          size: 1Gi
-          type: Filesystem
-        properties:
-          accessMode:
-            default: ReadWriteOnce
-            enum:
-            - ReadWriteOnce
-            - ReadOnlyMany
-            - ReadWriteMany
-            type: string
-          size:
-            default: 1Gi
-            type: string
-          type:
-            default: Filesystem
-            enum:
-            - Filesystem
-            - Block
-            type: string
-        type: object
-    type: object
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  mongo:
-    default: []
-    examples:
-    - []
-    items:
-      properties:
-        dbname:
-          default: ''
-          type: string
-        name:
-          default: ''
-          type: string
-        namespace:
-          default: ''
-          type: string
-        secret:
-          properties:
-            key:
-              default: ''
-              type: string
-            name:
-              default: ''
-              type: string
-          type: object
-        username:
-          default: ''
-          type: string
-      type: object
-    type: array
   maria:
     default: []
     examples:
@@ -135,15 +35,15 @@ options:
           type: string
       type: object
     type: array
-  app_group:
-    default: dev
+  ingress_class:
+    default: traefik
     examples:
-    - dev
+    - traefik
     type: string
-  sub_domain:
-    default: dbgate
+  domain_name:
+    default: your_company.com
     examples:
-    - dbgate
+    - your_company.com
     type: string
   redis:
     default: []
@@ -159,10 +59,49 @@ options:
           type: string
       type: object
     type: array
-  ingress_class:
-    default: traefik
+  mongo:
+    default: []
     examples:
-    - traefik
+    - []
+    items:
+      properties:
+        dbname:
+          default: ''
+          type: string
+        name:
+          default: ''
+          type: string
+        namespace:
+          default: ''
+          type: string
+        secret:
+          properties:
+            key:
+              default: ''
+              type: string
+            name:
+              default: ''
+              type: string
+          type: object
+        username:
+          default: ''
+          type: string
+      type: object
+    type: array
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  sub_domain:
+    default: dbgate
+    examples:
+    - dbgate
+    type: string
+  app_group:
+    default: dev
+    examples:
+    - dev
     type: string
   images:
     default:
@@ -203,16 +142,83 @@ options:
             type: string
         type: object
     type: object
-  domain_name:
-    default: your_company.com
+  storage:
+    default:
+      volume:
+        accessMode: ReadWriteOnce
+        class: ''
+        size: 1Gi
+        type: Filesystem
+    description: Configure this app storage
     examples:
-    - your_company.com
-    type: string
-  domain:
-    default: your-company
+    - volume:
+        accessMode: ReadWriteOnce
+        class: ''
+        size: 1Gi
+        type: Filesystem
+    properties:
+      volume:
+        default:
+          accessMode: ReadWriteOnce
+          class: ''
+          size: 1Gi
+          type: Filesystem
+        properties:
+          accessMode:
+            default: ReadWriteOnce
+            enum:
+            - ReadWriteOnce
+            - ReadOnlyMany
+            - ReadWriteMany
+            type: string
+          class:
+            default: ''
+            type: string
+          size:
+            default: 1Gi
+            type: string
+          type:
+            default: Filesystem
+            enum:
+            - Filesystem
+            - Block
+            type: string
+        type: object
+    type: object
+  issuer:
+    default: letsencrypt-prod
     examples:
-    - your-company
+    - letsencrypt-prod
     type: string
+  pg:
+    default: []
+    examples:
+    - []
+    items:
+      properties:
+        dbname:
+          default: ''
+          type: string
+        name:
+          default: ''
+          type: string
+        namespace:
+          default: ''
+          type: string
+        secret:
+          properties:
+            key:
+              default: ''
+              type: string
+            name:
+              default: ''
+              type: string
+          type: object
+        username:
+          default: ''
+          type: string
+      type: object
+    type: array
 dependencies:
 - dist: null
   category: core

apps/dbgate/presentation.tf

@@ -8,7 +8,7 @@ locals {
     Authorization   = "Bearer ${data.kubernetes_secret_v1.authentik.data["AUTHENTIK_BOOTSTRAP_TOKEN"]}"
   }
   service           = {
-    "name"  = "${var.component}-${var.instance}"
+    "name"  = 
     "port" = {
       "number" = 80
     }

apps/dbgate/pvc.tf

@@ -1,3 +1,16 @@
+locals {
+  pvc_spec = merge({
+    "accessModes" = [var.storage.volume.accessMode]
+    "volumeMode" = var.storage.volume.type
+    "resources" = {
+      "requests" = {
+        "storage" = "${var.storage.volume.size}"
+      }
+    }
+  }, var.storage.volume.class != "" ?{
+    "storageClassName" = var.storage.volume.class
+  }:{})
+}
 resource "kubectl_manifest" "pvc" {
   yaml_body  = <<-EOF
     apiVersion: v1
@@ -6,12 +19,6 @@ resource "kubectl_manifest" "pvc" {
       name: "${var.component}-${var.instance}"
       namespace: "${var.namespace}"
       labels: ${jsonencode(local.common-labels)}
-    spec:
-      accessModes:
-      - "${var.storage.volume.accessMode}"
-      resources:
-        requests:
-          storage: "${var.storage.volume.size}"
-      volumeMode: "${var.storage.volume.type}"
+    spec: ${jsonencode(local.pvc_spec)}
   EOF
 }