kube: standardize on a `local ns` convention
A convention is introduced to specify the kube.Namespace object in a deployment as a `local ns` instead of an `ns:` or a `namespace:` for these reasons:
- non-cluster admins cannot create new namespaces, and we've been moving in the direction of specifying objects that require cluster admin permissions to apply (policies, role bindings) in //cluster/kube/k0 instead of in the app jsonnet
- namespace admins CAN delete the namespace, making `kubecfg delete` unexpectedly dangerous (especially if a namespace contains more than just the contents of the file being applied - common with personal namespaces)
- `.Contain()` is a common operation, and it shows up in lines that are pretty long, so `ns.Contain()` is preferable to `app.ns.Contain()` or `service.namespace.Contain()`
Change-Id: Ie4ea825376dbf6faa175179054f3ee3de2253ae0
Reviewed-on: https://gerrit.hackerspace.pl/c/hscloud/+/1804
Reviewed-by: q3k <q3k@hackerspace.pl>
diff --git a/app/onlyoffice/prod.jsonnet b/app/onlyoffice/prod.jsonnet
index dcb8036..eafde30 100644
--- a/app/onlyoffice/prod.jsonnet
+++ b/app/onlyoffice/prod.jsonnet
@@ -16,14 +16,14 @@
domain: error "cfg.domain must be set",
},
- ns: kube.Namespace(cfg.namespace),
+ local ns = kube.Namespace(cfg.namespace),
- pvc: oo.ns.Contain(kube.PersistentVolumeClaim("documentserver")) {
+ pvc: ns.Contain(kube.PersistentVolumeClaim("documentserver")) {
storage:: "10Gi",
storageClass:: cfg.storageClassName,
},
- deploy: oo.ns.Contain(kube.Deployment("documentserver")) {
+ deploy: ns.Contain(kube.Deployment("documentserver")) {
spec+: {
template+: {
spec+: {
@@ -65,11 +65,11 @@
},
},
- svc: oo.ns.Contain(kube.Service("documentserver")) {
+ svc: ns.Contain(kube.Service("documentserver")) {
target:: oo.deploy,
},
- ingress: oo.ns.Contain(kube.SimpleIngress("office")) {
+ ingress: ns.Contain(kube.SimpleIngress("office")) {
hosts:: [cfg.domain],
target_service:: oo.svc,
},