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>

kube/kube.libsonnet

diff --git a/kube/kube.libsonnet b/kube/kube.libsonnet
index f9615c0..a8fe444 100644
--- a/kube/kube.libsonnet
+++ b/kube/kube.libsonnet
@@ -32,6 +32,11 @@
         },
     },
 
+    // Remove deprecated `volume.beta.kubernetes.io/storage-class` annotation
+    PersistentVolumeClaim(name): kube.PersistentVolumeClaim(name) {
+        metadata+: { annotations: {} },
+    },
+
     CephObjectStoreUser(name): kube._Object("ceph.rook.io/v1", "CephObjectStoreUser", name) {
         local user = self,
         spec: error "spec must be defined",

kube/postgres.libsonnet

diff --git a/kube/postgres.libsonnet b/kube/postgres.libsonnet
index 2935213..ac29f26 100644
--- a/kube/postgres.libsonnet
+++ b/kube/postgres.libsonnet
@@ -68,15 +68,8 @@
 
     volumeClaim: kube.PersistentVolumeClaim(postgres.makeName("postgres")) {
         metadata+: postgres.metadata,
-        spec+: {
-            storageClassName: cfg.storageClassName,
-            accessModes: [ "ReadWriteOnce" ],
-            resources: {
-                requests: {
-                    storage: cfg.storageSize,
-                },
-            },
-        },
+        storage: cfg.storageSize,
+        storageClass: cfg.storageClassName,
     },
     deployment: kube.Deployment(postgres.makeName("postgres")) {
         metadata+: postgres.metadata,

kube/postgres_v.libsonnet

diff --git a/kube/postgres_v.libsonnet b/kube/postgres_v.libsonnet
index 1e156f4..ce8dc85 100644
--- a/kube/postgres_v.libsonnet
+++ b/kube/postgres_v.libsonnet
@@ -47,15 +47,8 @@
 
     volumeClaim: kube.PersistentVolumeClaim(postgres.makeName("postgres")) {
         metadata+: postgres.metadata,
-        spec+: {
-            storageClassName: cfg.storageClassName,
-            accessModes: [ "ReadWriteOnce" ],
-            resources: {
-                requests: {
-                    storage: cfg.storageSize,
-                },
-            },
-        },
+        storage: cfg.storageSize,
+        storageClass: cfg.storageClassName,
     },
     deployment: kube.Deployment(postgres.makeName("postgres")) {
         metadata+: postgres.metadata,

kube/redis.libsonnet

diff --git a/kube/redis.libsonnet b/kube/redis.libsonnet
index 6cfe13b..9c21c49 100644
--- a/kube/redis.libsonnet
+++ b/kube/redis.libsonnet
@@ -44,15 +44,8 @@
 
     volumeClaim: kube.PersistentVolumeClaim(redis.makeName("redis")) {
         metadata+: redis.metadata,
-        spec+: {
-            storageClassName: cfg.storageClassName,
-            accessModes: [ "ReadWriteOnce" ],
-            resources: {
-                requests: {
-                    storage: "5Gi",
-                },
-            },
-        },
+        storage: "5Gi",
+        storageClass: cfg.storageClassName,
     },
     deployment: kube.Deployment(redis.makeName("redis")) {
         metadata+: redis.metadata,