fix

apps/woodpecker/datas.tf

@@ -10,6 +10,17 @@ locals {
     "app.kubernetes.io/name" = var.component
     "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" {
@@ -54,11 +65,11 @@ data "kustomization_overlay" "data" {
               - name: WOODPECKER_BACKEND_K8S_NAMESPACE
                 value: "${var.namespace}"
               - name: WOODPECKER_BACKEND_K8S_STORAGE_CLASS
-                value: "${var.storage-agent.storageClass}"
+                value: "${var.storage.volume.class}"
               - name: WOODPECKER_BACKEND_K8S_STORAGE_RWX
-                value: "${var.storage-agent.writeMany}"
+                value: "${var.storage.volume.accessMode=="ReadOnlyMany"?"true":"false"}"
               - name: WOODPECKER_BACKEND_K8S_VOLUME_SIZE
-                value: "${var.storage-agent.size}"
+                value: "${var.storage.agent.size}"
               - name: WOODPECKER_SERVER
                 value: "woodpecker-server.${var.namespace}.svc:9000"
     EOF
@@ -163,11 +174,7 @@ data "kustomization_overlay" "data" {
         volumeClaimTemplates:
         - metadata:
             name: data
-          spec:
-            accessModes: [ "${var.storage-server.accessMode}" ]
-            resources:
-              requests:
-                storage: ${var.storage-server.size}
+          spec: ${jsonencode(local.pvc_spec)}
     EOF
   }
 }