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>
diff --git a/personal/q3k/annoyatron/prod.jsonnet b/personal/q3k/annoyatron/prod.jsonnet
index 84f2f6e..acbd73f 100644
--- a/personal/q3k/annoyatron/prod.jsonnet
+++ b/personal/q3k/annoyatron/prod.jsonnet
@@ -51,6 +51,6 @@
namespace: "q3k",
},
hosts:: [cfg.domain],
- target_service:: annoyatron.svc,
+ target:: annoyatron.svc,
},
}
diff --git a/personal/q3k/ppsa.jsonnet b/personal/q3k/ppsa.jsonnet
index c5bf90a..accaadb 100644
--- a/personal/q3k/ppsa.jsonnet
+++ b/personal/q3k/ppsa.jsonnet
@@ -35,6 +35,6 @@
},
ingress: top.ns.Contain(kube.SimpleIngress("ppsa-jsonapi")) {
hosts:: ["ppsa.app.q3k.org"],
- target_service:: top.svc,
+ target:: top.svc,
},
}
diff --git a/personal/q3k/rc3.jsonnet b/personal/q3k/rc3.jsonnet
index b4112f2..3d2d351 100644
--- a/personal/q3k/rc3.jsonnet
+++ b/personal/q3k/rc3.jsonnet
@@ -37,6 +37,6 @@
namespace: "personal-q3k",
},
hosts:: ["rc3-data.q3k.org"],
- target_service:: rc3.svc,
+ target:: rc3.svc,
},
}
diff --git a/personal/q3k/wow/lib.libsonnet b/personal/q3k/wow/lib.libsonnet
index 6c359c0..36ba895 100644
--- a/personal/q3k/wow/lib.libsonnet
+++ b/personal/q3k/wow/lib.libsonnet
@@ -260,6 +260,6 @@
},
panelIngress: ns.Contain(kube.SimpleIngress(cfg.prefix + "panel")) {
hosts:: [cfg.panel.domain],
- target_service:: wow.panelSvc,
+ target:: wow.panelSvc,
},
}
diff --git a/personal/radex/demo-next/prod.jsonnet b/personal/radex/demo-next/prod.jsonnet
index d829eef..2135bfe 100644
--- a/personal/radex/demo-next/prod.jsonnet
+++ b/personal/radex/demo-next/prod.jsonnet
@@ -53,6 +53,6 @@
ingress: ns.Contain(kube.SimpleIngress(cfg.name)) {
hosts:: [cfg.domain],
- target_service:: top.service,
+ target:: top.service,
},
}
diff --git a/personal/radex/demo/prod.jsonnet b/personal/radex/demo/prod.jsonnet
index fbc4d03..1f8b7de 100644
--- a/personal/radex/demo/prod.jsonnet
+++ b/personal/radex/demo/prod.jsonnet
@@ -40,6 +40,6 @@
ingress: ns.Contain(kube.SimpleIngress(cfg.name)) {
hosts:: [cfg.domain],
- target_service:: top.service,
+ target:: top.service,
},
}
diff --git a/personal/radex/wordpress/prod.jsonnet b/personal/radex/wordpress/prod.jsonnet
index 21a373d..2282d28 100644
--- a/personal/radex/wordpress/prod.jsonnet
+++ b/personal/radex/wordpress/prod.jsonnet
@@ -56,7 +56,7 @@
ingress: ns.Contain(kube.SimpleIngress(cfg.name)) {
hosts:: [cfg.domain],
- target_service:: top.service,
+ target:: top.service,
},
mysql: {
diff --git a/personal/vuko/shells/prod.jsonnet b/personal/vuko/shells/prod.jsonnet
index bc654e6..b0d1922 100644
--- a/personal/vuko/shells/prod.jsonnet
+++ b/personal/vuko/shells/prod.jsonnet
@@ -139,7 +139,7 @@
# 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"),
},
}