*/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/devtools/issues/redmine.libsonnet b/devtools/issues/redmine.libsonnet
index 5e656db..e558d2b 100644
--- a/devtools/issues/redmine.libsonnet
+++ b/devtools/issues/redmine.libsonnet
@@ -1,4 +1,4 @@
-local kube = import "../../kube/kube.libsonnet";
+local kube = import "../../kube/hscloud.libsonnet";
local postgres = import "../../kube/postgres.libsonnet";
{
@@ -130,32 +130,9 @@
target_pod:: app.deployment.spec.template,
},
- ingress: app.ns.Contain(kube.Ingress("redmine")) {
- 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: "redmine-tls",
- },
- ],
- rules: [
- {
- host: cfg.domain,
- http: {
- paths: [
- { path: "/", backend: app.svc.name_port },
- ]
- },
- }
- ],
- },
+ ingress: app.ns.Contain(kube.SimpleIngress("redmine")) {
+ hosts:: [cfg.domain],
+ target_service:: app.svc,
},
b: (if std.length(cfg.b.domains) > 0 then {
@@ -182,34 +159,10 @@
svc: app.ns.Contain(kube.Service("b")) {
target_pod:: app.b.deployment.spec.template,
},
- ingress: app.ns.Contain(kube.Ingress("b")) {
- 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.b.domains,
- secretName: "b-tls",
- },
- ],
- rules: [
- {
- host: domain,
- http: {
- paths: [
- { path: "/", backend: app.b.svc.name_port },
- ]
- },
- }
- for domain in cfg.b.domains
- ],
- },
- }
+ ingress: app.ns.Contain(kube.SimpleIngress("b")) {
+ hosts:: cfg.b.domains,
+ target_service:: app.b.svc,
+ },
} else {}),
}