*: Simplify kube.PersistentVolumeClaims
Change-Id: I0a3e44de9f1c4db146fd1e493741f5fe381da3ae
Reviewed-on: https://gerrit.hackerspace.pl/c/hscloud/+/1768
Reviewed-by: q3k <q3k@hackerspace.pl>
diff --git a/personal/radex/demo-next/prod.jsonnet b/personal/radex/demo-next/prod.jsonnet
index c5abec7..30a0feb 100644
--- a/personal/radex/demo-next/prod.jsonnet
+++ b/personal/radex/demo-next/prod.jsonnet
@@ -44,14 +44,9 @@
},
data: top.ns.Contain(kube.PersistentVolumeClaim("data")) {
+ storage: "1Gi",
spec+: {
storageClassName: "waw-hdd-redundant-3",
- accessModes: [ "ReadWriteOnce" ],
- resources: {
- requests: {
- storage: "1Gi",
- },
- },
},
},
service: top.ns.Contain(kube.Service(cfg.name)) {
diff --git a/personal/radex/wordpress/prod.jsonnet b/personal/radex/wordpress/prod.jsonnet
index e3f457c..7b01580 100644
--- a/personal/radex/wordpress/prod.jsonnet
+++ b/personal/radex/wordpress/prod.jsonnet
@@ -63,15 +63,8 @@
local mysql = self,
volume: top.ns.Contain(kube.PersistentVolumeClaim("wordpress-mysql")) {
- spec+: {
- storageClassName: cfg.storageClassName,
- accessModes: [ "ReadWriteOnce" ],
- resources: {
- requests: {
- storage: cfg.storageSize,
- },
- },
- },
+ storage: cfg.storageSize,
+ storageClass: cfg.storageClassName,
},
deployment: top.ns.Contain(kube.Deployment("wordpress-mysql")) {