commit f28cd62c0e3da29a585f2ec29dd5cbb27a0b22b4
author Radek Pietruszewski <radex@hackerspace.pl> Fri Nov 03 17:30:10 2023 +0100
committer radex <radex@hackerspace.pl> Sat Nov 18 12:36:00 2023 +0000
tree 4c27cf6b0c064349e8f1c9b13f9352aa241c16e0
parent 527386ab0caecf157a6c9416c19b4525d54daa34

*: Simplify kube.PersistentVolumeClaims

Change-Id: I0a3e44de9f1c4db146fd1e493741f5fe381da3ae
Reviewed-on: https://gerrit.hackerspace.pl/c/hscloud/+/1768
Reviewed-by: q3k <q3k@hackerspace.pl>

hswaw/kube/pretalx.libsonnet

diff --git a/hswaw/kube/pretalx.libsonnet b/hswaw/kube/pretalx.libsonnet
index 2388529..d28aa59 100644
--- a/hswaw/kube/pretalx.libsonnet
+++ b/hswaw/kube/pretalx.libsonnet
@@ -231,15 +231,8 @@
 
         volumeData: kube.PersistentVolumeClaim(pretalx.makeName("-data")) {
             metadata+: pretalx.metadata,
-            spec+: {
-                storageClassName: cfg.storageClassName,
-                accessModes: ["ReadWriteOnce"],
-                resources: {
-                    requests: {
-                        storage: "5Gi",
-                    },
-                },
-            },
+            storage: "5Gi",
+            storageClass: cfg.storageClassName,
         },
 
         s3: kube.CephObjectStoreUser(pretalx.makeNameGlobal("-s3")) {

hswaw/paperless/paperless.libsonnet

diff --git a/hswaw/paperless/paperless.libsonnet b/hswaw/paperless/paperless.libsonnet
index 1bb3c41..30f1a58 100644
--- a/hswaw/paperless/paperless.libsonnet
+++ b/hswaw/paperless/paperless.libsonnet
@@ -59,15 +59,8 @@
     },
 
     dataVolume: app.ns.Contain(kube.PersistentVolumeClaim("paperless-data")) {
-        spec+: {
-            storageClassName: cfg.storageClassName,
-            accessModes: [ "ReadWriteOnce" ],
-            resources: {
-                requests: {
-                    storage: "100Gi",
-                },
-            },
-        },
+        storage: "100Gi",
+        storageClass: cfg.storageClassName,
     },
 
     deploy: app.ns.Contain(kube.Deployment("paperless")) {