kube: clean up (various)
Change-Id: Idc11cf70fa7fd0360f63438270748ef1d9bad989
Reviewed-on: https://gerrit.hackerspace.pl/c/hscloud/+/1810
Reviewed-by: q3k <q3k@hackerspace.pl>
diff --git a/ops/monitoring/lib/global.libsonnet b/ops/monitoring/lib/global.libsonnet
index 8477ad4..3b64290 100644
--- a/ops/monitoring/lib/global.libsonnet
+++ b/ops/monitoring/lib/global.libsonnet
@@ -87,6 +87,7 @@
spec+: {
template+: {
spec+: {
+ default_container: "vmauth",
containers_: {
default: kube.Container("default") {
image: cfg.images.victoria,
@@ -119,12 +120,6 @@
serviceAPI: ns.Contain(kube.Service("victoria-api")) {
target:: victoria.deploy,
- spec+: {
- ports: [
- { name: "api", port: 8427, targetPort: 8427, protocol: "TCP" },
- ],
- type: "ClusterIP",
- },
},
ingressAPI: ns.Contain(kube.SimpleIngress("victoria-api")) {
@@ -241,11 +236,6 @@
service: ns.Contain(kube.Service("grafana-public")) {
target:: grafana.deploy,
- spec+: {
- ports: [
- { name: "public", port: 3000, targetPort: 3000, protocol: "TCP" },
- ],
- },
},
ingress: ns.Contain(kube.SimpleIngress("grafana-public")) {
diff --git a/ops/sso/kube/sso.libsonnet b/ops/sso/kube/sso.libsonnet
index 24d5d68..cfed91e 100644
--- a/ops/sso/kube/sso.libsonnet
+++ b/ops/sso/kube/sso.libsonnet
@@ -7,6 +7,7 @@
local cfg = top.cfg,
cfg:: {
+ name: 'sso',
namespace: "sso",
image: "registry.k0.hswaw.net/informatic/sso-v2@sha256:1118effa697489028c3cd5a6786d3f94f16dbbe2810b1bf1b0f65ea15bac1914",
domain: error "domain must be set",
@@ -26,7 +27,7 @@
local ns = kube.Namespace(top.cfg.namespace),
- deployment: ns.Contain(kube.Deployment("sso")) {
+ deployment: ns.Contain(kube.Deployment(cfg.name)) {
spec+: {
replicas: 1,
template+: {
@@ -99,17 +100,11 @@
},
},
- svc: ns.Contain(kube.Service("sso")) {
+ svc: ns.Contain(kube.Service(cfg.name)) {
target:: top.deployment,
- spec+: {
- ports: [
- { name: "http", port: 5000, targetPort: 5000, protocol: "TCP" },
- ],
- type: "ClusterIP",
- },
},
- ingress: ns.Contain(kube.SimpleIngress("sso")) {
+ ingress: ns.Contain(kube.SimpleIngress(cfg.name)) {
hosts:: [cfg.domain],
target:: top.svc,
},