kube: clean up SimpleIngress

Rename `target_service` to `target` to mirror Service's `target`; rename `extra_paths` to `extraPaths` to follow the camelCase convention used everywhere except for a few places in kube.upstream (assumed to be a mistake)

Change-Id: Icfcb70ef889e3359bf0391c465034817f4b70cce
Reviewed-on: https://gerrit.hackerspace.pl/c/hscloud/+/1809
Reviewed-by: q3k <q3k@hackerspace.pl>

app/inventory/prod.jsonnet

@@ -85,6 +85,6 @@ local postgres = import '../../kube/postgres_v.libsonnet';
 
   ingress: ns.Contain(kube.SimpleIngress(cfg.name)) {
     hosts:: [cfg.domain],
-    target_service:: top.service,
+    target:: top.service,
   },
 }

app/mailman-web/kube/mailman.libsonnet

@@ -171,7 +171,7 @@ local kube = import "../../../kube/hscloud.libsonnet";
 
     #ingress: ns.Contain(kube.SimpleIngress("mailman")) {
     #    hosts:: [cfg.webDomain],
-    #    target_service:: top.svcWeb,
+    #    target:: top.svcWeb,
     #},
 
     config: ns.Contain(kube.Secret("config")) {

app/matrix/lib/matrix.libsonnet

@@ -387,9 +387,9 @@ local postgres = import "../../../kube/postgres.libsonnet";
 
     ingress: kube.SimpleIngress("matrix") {
         hosts:: [cfg.webDomain],
-        target_service:: top.riotSvc,
+        target:: top.riotSvc,
         metadata+: top.metadata("matrix"),
-        extra_paths:: [
+        extraPaths:: [
             { path: "/_matrix", backend: top.synapseSvc.name_port },
         ] + (if cfg.cas.enable then [
             { path: "/_cas", backend: top.casSvc.name_port },

app/onlyoffice/prod.jsonnet

@@ -75,7 +75,7 @@ local policies = import "../../kube/policies.libsonnet";
 
         ingress: ns.Contain(kube.SimpleIngress("office")) {
             hosts:: [cfg.domain],
-            target_service:: top.svc,
+            target:: top.svc,
         },
 
         // Needed because the documentserver runs its own supervisor, and:

app/walne/prod.jsonnet

@@ -53,6 +53,6 @@ local kube = import '../../kube/hscloud.libsonnet';
 
     ingress: ns.Contain(kube.SimpleIngress(cfg.name)) {
         hosts:: [cfg.domain],
-        target_service:: top.service,
+        target:: top.service,
     },
 }

bgpwtf/cccampix/kube/ix.libsonnet

@@ -421,19 +421,19 @@ local kube = import "../../../kube/hscloud.libsonnet";
 
         ingress: kube.SimpleIngress("ingress") {
             hosts:: [cfg.frontend.domain],
-            target_service:: ix.frontend.svc,
+            target:: ix.frontend.svc,
             metadata+: ix.metadata("public"),
         },
 
         aliceIngress: kube.SimpleIngress("alice") {
             hosts:: [cfg.alice.domain],
-            target_service:: ix.alice.svc,
+            target:: ix.alice.svc,
             metadata+: ix.metadata("alice"),
         },
 
         grpcIngress: kube.SimpleIngress("grpc") {
             hosts:: [cfg.verifier.domain],
-            target_service:: ix.verifier.svc,
+            target:: ix.verifier.svc,
             metadata+: ix.metadata("alice") {
                 annotations+: {
                     "kubernetes.io/ingress.class": "nginx",

bgpwtf/internet/kube/prod.jsonnet

@@ -61,7 +61,7 @@ local kube = import '../../../kube/hscloud.libsonnet';
 
     ingress: kube.SimpleIngress("frontend") {
         hosts:: [cfg.domain],
-        target_service:: top.svc,
+        target:: top.svc,
         metadata+: top.metadata("frontend"),
     },
 }

bgpwtf/speedtest/kube/prod.jsonnet

@@ -60,7 +60,7 @@ local kube = import '../../../kube/hscloud.libsonnet';
 
     ingress: kube.SimpleIngress("public") {
         hosts:: [cfg.domain],
-        target_service:: top.svc,
+        target:: top.svc,
         metadata+: top.metadata("public"),
     },
 }

cluster/kube/lib/rook.libsonnet

@@ -755,7 +755,7 @@ local oa = kube.OpenAPI;
 
         dashboardIngress: kube.SimpleIngress(cluster.name("dashboard")) {
             hosts:: ["%s.hswaw.net" % name],
-            target_service:: cluster.dashboardService,
+            target:: cluster.dashboardService,
         },
 
         # Benji is a backup tool, external to rook, that we use for backing up

devtools/gerrit/kube/gerrit.libsonnet

@@ -224,7 +224,7 @@ local kube = import "../../../kube/hscloud.libsonnet";
 
     ingress: kube.SimpleIngress(top.name("gerrit")) {
         hosts:: [cfg.domain],
-        target_service:: top.svc,
+        target:: top.svc,
         metadata+: top.metadata("ingress"),
     },
 }

devtools/issues/redmine.libsonnet

@@ -127,7 +127,7 @@ local postgres = import "../../kube/postgres.libsonnet";
 
     ingress: ns.Contain(kube.SimpleIngress("redmine")) {
         hosts:: [cfg.domain],
-        target_service:: top.svc,
+        target:: top.svc,
     },
 
     b: (if std.length(cfg.b.domains) > 0 then {
@@ -156,7 +156,7 @@ local postgres = import "../../kube/postgres.libsonnet";
         },
         ingress: ns.Contain(kube.SimpleIngress("b")) {
             hosts:: cfg.b.domains,
-            target_service:: top.b.svc,
+            target:: top.b.svc,
         },
     } else {}),
 

hswaw/capacifier/prod.jsonnet

@@ -56,6 +56,6 @@ local kube = import "../../kube/hscloud.libsonnet";
 
     ingress: ns.Contain(kube.SimpleIngress(cfg.name)) {
         hosts:: [cfg.domain],
-        target_service:: top.service,
+        target:: top.service,
     },
 }

hswaw/cebulacamp/landing/kube/prod.jsonnet

@@ -45,6 +45,6 @@ local kube = import "../../../../kube/hscloud.libsonnet";
 
     ingress: ns.Contain(kube.SimpleIngress(cfg.name)) {
         hosts:: [cfg.domain],
-        target_service:: top.service,
+        target:: top.service,
     },
 }

hswaw/ldapweb/prod.jsonnet

@@ -57,6 +57,6 @@ local kube = import "../../kube/hscloud.libsonnet";
 
     ingress: ns.Contain(kube.SimpleIngress(cfg.name)) {
         hosts:: [cfg.domain],
-        target_service:: top.service,
+        target:: top.service,
     },
 }

hswaw/oodviewer/prod.jsonnet

@@ -62,6 +62,6 @@ local kube = import "../../kube/hscloud.libsonnet";
 
     ingress: ns.Contain(kube.SimpleIngress("oodviewer")) {
         hosts:: [cfg.domain],
-        target_service:: top.service,
+        target:: top.service,
     },
 }

hswaw/paperless/paperless.libsonnet

@@ -175,6 +175,6 @@ local redis = import "../../kube/redis.libsonnet";
 
     ingress: ns.Contain(kube.SimpleIngress("paperless")) {
         hosts:: [cfg.domain],
-        target_service:: top.service,
+        target:: top.service,
     },
 }

hswaw/site/prod.jsonnet

@@ -47,6 +47,6 @@ local kube = import "../../kube/hscloud.libsonnet";
 
     ingress: ns.Contain(kube.SimpleIngress(cfg.name)) {
         hosts:: cfg.domains,
-        target_service:: top.service,
+        target:: top.service,
     },
 }

kube/hscloud.libsonnet

@@ -3,12 +3,12 @@
 local kube = import "kube.libsonnet";
 
 kube {
-    // Basic Ingress config pointing `hosts` to `target_service`, with HTTPS set up
+    // Basic Ingress config pointing `hosts` to the `target` service, with HTTPS set up
     SimpleIngress(name): kube.Ingress(name) {
         local ingress = self,
-        hosts:: error "hosts must be defined",
-        target_service:: error "target_service must be defined",
-        extra_paths:: [],
+        hosts:: error "SimpleIngress.hosts must be defined",
+        target:: error "SimpleIngress.target service must be defined",
+        extraPaths:: [],
         metadata+: {
             annotations+: {
                 'kubernetes.io/tls-acme': 'true',
@@ -23,8 +23,8 @@ kube {
                     host: host,
                     http: {
                         paths: [
-                            { path: '/', backend: ingress.target_service.name_port },
-                        ] + ingress.extra_paths,
+                            { path: '/', backend: ingress.target.name_port },
+                        ] + ingress.extraPaths,
                     },
                 }
                 for host in ingress.hosts

ops/monitoring/lib/global.libsonnet

@@ -129,7 +129,7 @@ local kube = import "../../../kube/hscloud.libsonnet";
 
             ingressAPI: ns.Contain(kube.SimpleIngress("victoria-api")) {
                 hosts:: [cfg.hosts.globalAPI],
-                target_service:: victoria.serviceAPI,
+                target:: victoria.serviceAPI,
             },
         },
 
@@ -250,7 +250,7 @@ local kube = import "../../../kube/hscloud.libsonnet";
 
             ingress: ns.Contain(kube.SimpleIngress("grafana-public")) {
                 hosts:: [cfg.hosts.globalDashboard],
-                target_service:: grafana.service,
+                target:: grafana.service,
             },
         },
     }

ops/sso/kube/sso.libsonnet

@@ -111,6 +111,6 @@ local kube = import "../../../kube/hscloud.libsonnet";
 
     ingress: ns.Contain(kube.SimpleIngress("sso")) {
         hosts:: [cfg.domain],
-        target_service:: top.svc,
+        target:: top.svc,
     },
 }

personal/q3k/annoyatron/prod.jsonnet

@@ -51,6 +51,6 @@ local kube = import '../../../kube/hscloud.libsonnet';
             namespace: "q3k",
         },
         hosts:: [cfg.domain],
-        target_service:: annoyatron.svc,
+        target:: annoyatron.svc,
     },
 }

personal/q3k/ppsa.jsonnet

@@ -35,6 +35,6 @@ local kube = import "../../kube/hscloud.libsonnet";
     },
     ingress: top.ns.Contain(kube.SimpleIngress("ppsa-jsonapi")) {
         hosts:: ["ppsa.app.q3k.org"],
-        target_service:: top.svc,
+        target:: top.svc,
     },
 }

personal/q3k/rc3.jsonnet

@@ -37,6 +37,6 @@ local kube = import "../../kube/hscloud.libsonnet";
             namespace: "personal-q3k",
         },
         hosts:: ["rc3-data.q3k.org"],
-        target_service:: rc3.svc,
+        target:: rc3.svc,
     },
 }

personal/q3k/wow/lib.libsonnet

@@ -260,6 +260,6 @@ local kube = import "../../../kube/hscloud.libsonnet";
     },
     panelIngress: ns.Contain(kube.SimpleIngress(cfg.prefix + "panel")) {
         hosts:: [cfg.panel.domain],
-        target_service:: wow.panelSvc,
+        target:: wow.panelSvc,
     },
 }

personal/radex/demo-next/prod.jsonnet

@@ -53,6 +53,6 @@ local kube = import "../../../kube/hscloud.libsonnet";
 
     ingress: ns.Contain(kube.SimpleIngress(cfg.name)) {
         hosts:: [cfg.domain],
-        target_service:: top.service,
+        target:: top.service,
     },
 }

personal/radex/demo/prod.jsonnet

@@ -40,6 +40,6 @@ local kube = import "../../../kube/hscloud.libsonnet";
 
     ingress: ns.Contain(kube.SimpleIngress(cfg.name)) {
         hosts:: [cfg.domain],
-        target_service:: top.service,
+        target:: top.service,
     },
 }

personal/radex/wordpress/prod.jsonnet

@@ -56,7 +56,7 @@ local kube = import "../../../kube/hscloud.libsonnet";
 
     ingress: ns.Contain(kube.SimpleIngress(cfg.name)) {
         hosts:: [cfg.domain],
-        target_service:: top.service,
+        target:: top.service,
     },
 
     mysql: {

personal/vuko/shells/prod.jsonnet

@@ -139,7 +139,7 @@ local kube = import '../../../kube/hscloud.libsonnet';
     # requests to your domain to specified Pod/container
     ingress: kube.SimpleIngress("frontend") {
         hosts:: [cfg.domain],
-        target_service:: shells.svc,
+        target:: shells.svc,
         metadata+: shells.metadata("frontend"),
     },
 }