*/kube: Add kube.SimpleIngress
Change-Id: Iddcac629b9938f228dd93b32e58bb14606d5c6e5
Reviewed-on: https://gerrit.hackerspace.pl/c/hscloud/+/1745
Reviewed-by: q3k <q3k@hackerspace.pl>
diff --git a/personal/radex/demo-next/prod.jsonnet b/personal/radex/demo-next/prod.jsonnet
index dce74b9..c5abec7 100644
--- a/personal/radex/demo-next/prod.jsonnet
+++ b/personal/radex/demo-next/prod.jsonnet
@@ -1,4 +1,4 @@
-local kube = import "../../../kube/kube.libsonnet";
+local kube = import "../../../kube/hscloud.libsonnet";
{
local top = self,
@@ -58,26 +58,8 @@
target_pod:: top.deployment.spec.template,
},
- ingress: top.ns.Contain(kube.Ingress(cfg.name)) {
- metadata+: {
- annotations+: {
- "kubernetes.io/tls-acme": "true",
- "cert-manager.io/cluster-issuer": "letsencrypt-prod",
- "nginx.ingress.kubernetes.io/proxy-body-size": "0",
- },
- },
- spec+: {
- tls: [ { hosts: [ cfg.domain ], secretName: cfg.name + "-tls" } ],
- rules: [
- {
- host: cfg.domain,
- http: {
- paths: [
- { path: "/", backend: top.service.name_port },
- ],
- },
- },
- ],
- },
- }
+ ingress: top.ns.Contain(kube.SimpleIngress(cfg.name)) {
+ hosts:: [cfg.domain],
+ target_service:: top.service,
+ },
}
diff --git a/personal/radex/demo/prod.jsonnet b/personal/radex/demo/prod.jsonnet
index 23cc20f..a5f7678 100644
--- a/personal/radex/demo/prod.jsonnet
+++ b/personal/radex/demo/prod.jsonnet
@@ -1,4 +1,4 @@
-local kube = import "../../../kube/kube.libsonnet";
+local kube = import "../../../kube/hscloud.libsonnet";
{
local top = self,
@@ -38,26 +38,8 @@
target_pod:: top.deployment.spec.template,
},
- ingress: top.ns.Contain(kube.Ingress(cfg.name)) {
- metadata+: {
- annotations+: {
- "kubernetes.io/tls-acme": "true",
- "cert-manager.io/cluster-issuer": "letsencrypt-prod",
- "nginx.ingress.kubernetes.io/proxy-body-size": "0",
- },
- },
- spec+: {
- tls: [ { hosts: [ cfg.domain ], secretName: cfg.name + "-tls" } ],
- rules: [
- {
- host: cfg.domain,
- http: {
- paths: [
- { path: "/", backend: top.service.name_port },
- ],
- },
- },
- ],
- },
- }
+ ingress: top.ns.Contain(kube.SimpleIngress(cfg.name)) {
+ hosts:: [cfg.domain],
+ target_service:: top.service,
+ },
}