kube: clean up PersistentVolumeClaims
There's no difference as far as jsonnet is concerned, but it may confuse newbies, as Service and SimpleIngress use double colon for its top-level kube helpers. This also removes any ambiguity as to whether this is manifested in final JSON. So we can make that a convention.
Change-Id: I01ad4ea63f4d5d8ee6e5d41c79637ba186548c6f
Reviewed-on: https://gerrit.hackerspace.pl/c/hscloud/+/1803
Reviewed-by: q3k <q3k@hackerspace.pl>
diff --git a/personal/noisersup/openrct2.jsonnet b/personal/noisersup/openrct2.jsonnet
index 9ec05d6..adaf8db 100644
--- a/personal/noisersup/openrct2.jsonnet
+++ b/personal/noisersup/openrct2.jsonnet
@@ -27,8 +27,8 @@
volumeClaim: kube.PersistentVolumeClaim(name) {
metadata+: server.metadata,
- storage: "5Gi",
- storageClass: cfg.storageClassName,
+ storage:: "5Gi",
+ storageClass:: cfg.storageClassName,
},
config: kube.ConfigMap(name + "-config") {
diff --git a/personal/q3k/openrct2.jsonnet b/personal/q3k/openrct2.jsonnet
index bb4cd05..ce49aa3 100644
--- a/personal/q3k/openrct2.jsonnet
+++ b/personal/q3k/openrct2.jsonnet
@@ -27,8 +27,8 @@
volumeClaim: kube.PersistentVolumeClaim(name) {
metadata+: server.metadata,
- storage: "5Gi",
- storageClass: cfg.storageClassName,
+ storage:: "5Gi",
+ storageClass:: cfg.storageClassName,
},
config: kube.ConfigMap(name + "-config") {
diff --git a/personal/q3k/wow/lib.libsonnet b/personal/q3k/wow/lib.libsonnet
index 9e24975..6c359c0 100644
--- a/personal/q3k/wow/lib.libsonnet
+++ b/personal/q3k/wow/lib.libsonnet
@@ -47,8 +47,8 @@
ns: kube.Namespace(cfg.namespace),
data: ns.Contain(kube.PersistentVolumeClaim(cfg.prefix + "data")) {
- storage: "50Gi",
- storageClass: "waw-hdd-redundant-3",
+ storage:: "50Gi",
+ storageClass:: "waw-hdd-redundant-3",
},
// Make a *DatabaseInfo string for use by acore config. These are not any real
@@ -209,8 +209,8 @@
},
},
panelData: ns.Contain(kube.PersistentVolumeClaim(cfg.prefix + "panel-data")) {
- storage: "128Mi",
- storageClass: "waw-hdd-redundant-3",
+ storage:: "128Mi",
+ storageClass:: "waw-hdd-redundant-3",
},
panelDeploy: ns.Contain(kube.Deployment(cfg.prefix + "panel")) {
spec+: {
diff --git a/personal/radex/demo-next/prod.jsonnet b/personal/radex/demo-next/prod.jsonnet
index b0308d0..5710030 100644
--- a/personal/radex/demo-next/prod.jsonnet
+++ b/personal/radex/demo-next/prod.jsonnet
@@ -44,10 +44,8 @@
},
data: top.ns.Contain(kube.PersistentVolumeClaim("data")) {
- storage: "1Gi",
- spec+: {
- storageClassName: "waw-hdd-redundant-3",
- },
+ storage:: "1Gi",
+ storageClass:: "waw-hdd-redundant-3",
},
service: top.ns.Contain(kube.Service(cfg.name)) {
target:: top.deployment,
diff --git a/personal/radex/wordpress/prod.jsonnet b/personal/radex/wordpress/prod.jsonnet
index 55f43be..47e71e7 100644
--- a/personal/radex/wordpress/prod.jsonnet
+++ b/personal/radex/wordpress/prod.jsonnet
@@ -63,8 +63,8 @@
local mysql = self,
volume: top.ns.Contain(kube.PersistentVolumeClaim("wordpress-mysql")) {
- storage: cfg.storageSize,
- storageClass: cfg.storageClassName,
+ storage:: cfg.storageSize,
+ storageClass:: cfg.storageClassName,
},
deployment: top.ns.Contain(kube.Deployment("wordpress-mysql")) {