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/app/inventory/prod.jsonnet b/app/inventory/prod.jsonnet
index eb08009..5648692 100644
--- a/app/inventory/prod.jsonnet
+++ b/app/inventory/prod.jsonnet
@@ -65,8 +65,8 @@
},
media: top.ns.Contain(kube.PersistentVolumeClaim(cfg.name)) {
- storage: '20Gi',
- storageClass: cfg.storageClassName,
+ storage:: '20Gi',
+ storageClass:: cfg.storageClassName,
},
psql: postgres {
diff --git a/app/matrix/lib/appservice-irc.libsonnet b/app/matrix/lib/appservice-irc.libsonnet
index f696970..33fa5e1 100644
--- a/app/matrix/lib/appservice-irc.libsonnet
+++ b/app/matrix/lib/appservice-irc.libsonnet
@@ -49,8 +49,8 @@
dataVolume: kube.PersistentVolumeClaim("appservice-irc-%s" % [name]) {
metadata+: cfg.metadata,
- storage: "10Gi",
- storageClass: cfg.storageClassName,
+ storage:: "10Gi",
+ storageClass:: cfg.storageClassName,
},
bootstrapJob: if cfg.bootstrapJob then (kube.Job("appservice-irc-%s-bootstrap" % [name]) {
diff --git a/app/matrix/lib/appservice-telegram.libsonnet b/app/matrix/lib/appservice-telegram.libsonnet
index 209e855..77eac1d 100644
--- a/app/matrix/lib/appservice-telegram.libsonnet
+++ b/app/matrix/lib/appservice-telegram.libsonnet
@@ -58,8 +58,8 @@
dataVolume: kube.PersistentVolumeClaim("appservice-telegram-%s" % [name]) {
metadata+: cfg.metadata,
- storage: "10Gi",
- storageClass: cfg.storageClassName,
+ storage:: "10Gi",
+ storageClass:: cfg.storageClassName,
},
bootstrapJob: if cfg.bootstrapJob then (kube.Job("appservice-telegram-%s-bootstrap" % [name]) {
diff --git a/app/matrix/lib/coturn.libsonnet b/app/matrix/lib/coturn.libsonnet
index e63a0bc..f1b127b 100644
--- a/app/matrix/lib/coturn.libsonnet
+++ b/app/matrix/lib/coturn.libsonnet
@@ -60,8 +60,8 @@
},
dataVolume: app.ns.Contain(kube.PersistentVolumeClaim("coturn-data")) {
- storage: "10Gi",
- storageClass: cfg.storageClassName,
+ storage:: "10Gi",
+ storageClass:: cfg.storageClassName,
},
deployment: app.ns.Contain(kube.Deployment("coturn")) {
diff --git a/app/matrix/lib/matrix.libsonnet b/app/matrix/lib/matrix.libsonnet
index c72b060..29cdaf5 100644
--- a/app/matrix/lib/matrix.libsonnet
+++ b/app/matrix/lib/matrix.libsonnet
@@ -97,8 +97,8 @@
dataVolume: kube.PersistentVolumeClaim("synapse-data-waw3") {
metadata+: app.metadata("synapse-data"),
- storage: "50Gi",
- storageClass: cfg.storageClassName,
+ storage:: "50Gi",
+ storageClass:: cfg.storageClassName,
},
// homeserver.yaml that will be used to run synapse (in synapseConfigMap).
diff --git a/app/matrix/lib/synapse.libsonnet b/app/matrix/lib/synapse.libsonnet
index 925a715..07656da 100644
--- a/app/matrix/lib/synapse.libsonnet
+++ b/app/matrix/lib/synapse.libsonnet
@@ -31,8 +31,8 @@
appservices:: error "appservices need to be provided",
dataVolume: app.ns.Contain(kube.PersistentVolumeClaim("synapse-data-waw3")) {
- storage: "50Gi",
- storageClass: cfg.storageClassName,
+ storage:: "50Gi",
+ storageClass:: cfg.storageClassName,
},
// homeserver.yaml that will be used to run synapse (in configMap).
diff --git a/app/onlyoffice/prod.jsonnet b/app/onlyoffice/prod.jsonnet
index 6919b1a..dcb8036 100644
--- a/app/onlyoffice/prod.jsonnet
+++ b/app/onlyoffice/prod.jsonnet
@@ -19,8 +19,8 @@
ns: kube.Namespace(cfg.namespace),
pvc: oo.ns.Contain(kube.PersistentVolumeClaim("documentserver")) {
- storage: "10Gi",
- storageClass: cfg.storageClassName,
+ storage:: "10Gi",
+ storageClass:: cfg.storageClassName,
},
deploy: oo.ns.Contain(kube.Deployment("documentserver")) {