fix

monitor/grafana/datas.tf

@@ -9,8 +9,20 @@ locals {
     "app.kubernetes.io/managed-by" = "vynil"
     "app.kubernetes.io/instance" = var.instance
   }
+  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
+  }:{})
 }
 
+
 data "kubernetes_secret_v1" "authentik" {
   metadata {
     name      = "authentik"
@@ -56,13 +68,7 @@ data "kustomization_overlay" "data" {
         name: grafana
         annotations:
           k8up.io/backup: "true"
-      spec:
-        accessModes:
-        - "${var.storage.volume.accessMode}"
-        volumeMode: Filesystem
-        resources:
-          requests:
-            storage: "${var.storage.volume.size}"
+      spec: ${jsonencode(local.pvc_spec)}
     EOF
   }
   patches {

monitor/grafana/index.yaml

@@ -6,11 +6,84 @@ metadata:
   name: grafana
   description: null
 options:
+  storage:
+    default:
+      volume:
+        accessMode: ReadWriteOnce
+        class: ''
+        size: 10Gi
+        type: Filesystem
+    description: Configure this app storage
+    examples:
+    - volume:
+        accessMode: ReadWriteOnce
+        class: ''
+        size: 10Gi
+        type: Filesystem
+    properties:
+      volume:
+        default:
+          accessMode: ReadWriteOnce
+          class: ''
+          size: 10Gi
+          type: Filesystem
+        properties:
+          accessMode:
+            default: ReadWriteOnce
+            enum:
+            - ReadWriteOnce
+            - ReadOnlyMany
+            - ReadWriteMany
+            type: string
+          class:
+            default: ''
+            type: string
+          size:
+            default: 10Gi
+            type: string
+          type:
+            default: Filesystem
+            enum:
+            - Filesystem
+            - Block
+            type: string
+        type: object
+    type: object
+  ingress_class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  sub_domain:
+    default: grafana
+    examples:
+    - grafana
+    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
   domain:
     default: your-company
     examples:
     - your-company
     type: string
+  domain_name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  app_group:
+    default: monitor
+    examples:
+    - monitor
+    type: string
+  admin_name:
+    default: grafana_admin
+    examples:
+    - grafana_admin
+    type: string
   images:
     default:
       busybox:
@@ -108,73 +181,6 @@ options:
             type: string
         type: object
     type: object
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  sub_domain:
-    default: grafana
-    examples:
-    - grafana
-    type: string
-  storage:
-    default:
-      volume:
-        accessMode: ReadWriteOnce
-        size: 10Gi
-        type: Filesystem
-    description: Configure this app storage
-    examples:
-    - volume:
-        accessMode: ReadWriteOnce
-        size: 10Gi
-        type: Filesystem
-    properties:
-      volume:
-        default:
-          accessMode: ReadWriteOnce
-          size: 10Gi
-          type: Filesystem
-        properties:
-          accessMode:
-            default: ReadWriteOnce
-            enum:
-            - ReadWriteOnce
-            - ReadOnlyMany
-            - ReadWriteMany
-            type: string
-          size:
-            default: 10Gi
-            type: string
-          type:
-            default: Filesystem
-            enum:
-            - Filesystem
-            - Block
-            type: string
-        type: object
-    type: object
-  app_group:
-    default: monitor
-    examples:
-    - monitor
-    type: string
-  domain_name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  admin_name:
-    default: grafana_admin
-    examples:
-    - grafana_admin
-    type: string
-  ingress_class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
 dependencies: []
 providers:
   kubernetes: true

monitor/loki/datas.tf

@@ -7,6 +7,17 @@ locals {
     "app.kubernetes.io/managed-by" = "vynil"
     "app.kubernetes.io/instance" = var.instance
   }
+  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
+  }:{})
   rb-patch = <<-EOF
     - op: replace
       path: /subjects/0/namespace
@@ -58,13 +69,7 @@ data "kustomization_overlay" "data" {
               name: storage
               annotations:
                 k8up.io/backup: "true"
-            spec:
-              accessModes:
-              - "${var.storage.volume.accessMode}"
-              volumeMode: Filesystem
-              resources:
-                requests:
-                  storage: "${var.storage.volume.size}"
+            spec: ${jsonencode(local.pvc_spec)}
     EOF
   }
 }

monitor/loki/index.yaml

@@ -10,18 +10,21 @@ options:
     default:
       volume:
         accessMode: ReadWriteOnce
+        class: ''
         size: 10Gi
         type: Filesystem
     description: Configure this app storage
     examples:
     - volume:
         accessMode: ReadWriteOnce
+        class: ''
         size: 10Gi
         type: Filesystem
     properties:
       volume:
         default:
           accessMode: ReadWriteOnce
+          class: ''
           size: 10Gi
           type: Filesystem
         properties:
@@ -32,6 +35,9 @@ options:
             - ReadOnlyMany
             - ReadWriteMany
             type: string
+          class:
+            default: ''
+            type: string
           size:
             default: 10Gi
             type: string