cluster/kube: group admitomatic, admins entries by category
Change-Id: I0405fd894c775314059e382a804994184afb0f64
Reviewed-on: https://gerrit.hackerspace.pl/c/hscloud/+/1800
Reviewed-by: informatic <informatic@hackerspace.pl>
diff --git a/cluster/kube/k0.libsonnet b/cluster/kube/k0.libsonnet
index 46eb7d3..2527059 100644
--- a/cluster/kube/k0.libsonnet
+++ b/cluster/kube/k0.libsonnet
@@ -343,35 +343,44 @@
// hijacked by other cluster users, you should also state
// it here (either as a wildcard, or unary domains).
allow_domain: [
+ // app
{ namespace: "inventory", dns: "inventory.hackerspace.pl" },
- { namespace: "capacifier", dns: "capacifier.hackerspace.pl" },
- { namespace: "ldapweb", dns: "profile.hackerspace.pl" },
- { namespace: "walne", dns: "walne.hackerspace.pl" },
- { namespace: "devtools-prod", dns: "hackdoc.hackerspace.pl" },
- { namespace: "devtools-prod", dns: "cs.hackerspace.pl" },
- { namespace: "sourcegraph", dns: "cs.hackerspace.pl" },
- { namespace: "codehosting-prod", dns: "git.hackerspace.pl" },
- { namespace: "codehosting-prod", dns: "code.hackerspace.pl" },
- { namespace: "engelsystem-prod", dns: "engelsystem.hackerspace.pl" },
- { namespace: "gerrit", dns: "gerrit.hackerspace.pl" },
- { namespace: "gerrit-qa", dns: "gerrit-qa.hackerspace.pl" },
- { namespace: "gitea-prod", dns: "gitea.hackerspace.pl" },
- { namespace: "hswaw-prod", dns: "*.hackerspace.pl" },
- { namespace: "hswaw-prod", dns: "*.hswaw.net" },
- { namespace: "site", dns: "new.hackerspace.pl" },
- { namespace: "internet", dns: "internet.hackerspace.pl" },
+ { namespace: "mastodon-hackerspace-qa", dns: "social-qa-2.hackerspace.pl" },
+ { namespace: "mastodon-hackerspace-prod", dns: "social.hackerspace.pl" },
{ namespace: "matrix", dns: "matrix.hackerspace.pl" },
{ namespace: "onlyoffice-prod", dns: "office.hackerspace.pl" },
- { namespace: "paperless", dns: "paperless.hackerspace.pl" },
+ { namespace: "walne", dns: "walne.hackerspace.pl" },
+
+ // bgpwtf
+ { namespace: "internet", dns: "internet.hackerspace.pl" },
+ { namespace: "speedtest", dns: "speedtest.hackerspace.pl" },
+
+ // devtools
+ { namespace: "devtools-prod", dns: "hackdoc.hackerspace.pl" },
+ { namespace: "devtools-prod", dns: "cs.hackerspace.pl" },
+ { namespace: "gitea-prod", dns: "gitea.hackerspace.pl" },
+ { namespace: "codehosting-prod", dns: "git.hackerspace.pl" },
+ { namespace: "codehosting-prod", dns: "code.hackerspace.pl" },
+ { namespace: "gerrit", dns: "gerrit.hackerspace.pl" },
+ { namespace: "gerrit-qa", dns: "gerrit-qa.hackerspace.pl" },
{ namespace: "redmine", dns: "issues.hackerspace.pl" },
{ namespace: "redmine", dns: "b.hackerspace.pl" },
{ namespace: "redmine", dns: "b.hswaw.net" },
{ namespace: "redmine", dns: "xn--137h.hackerspace.pl" },
{ namespace: "redmine", dns: "xn--137h.hswaw.net" },
- { namespace: "speedtest", dns: "speedtest.hackerspace.pl" },
+ { namespace: "sourcegraph", dns: "cs.hackerspace.pl" },
+
+ // hswaw
+ { namespace: "hswaw-prod", dns: "*.hackerspace.pl" },
+ { namespace: "hswaw-prod", dns: "*.hswaw.net" },
+ { namespace: "capacifier", dns: "capacifier.hackerspace.pl" },
+ { namespace: "engelsystem-prod", dns: "engelsystem.hackerspace.pl" },
+ { namespace: "ldapweb", dns: "profile.hackerspace.pl" },
+ { namespace: "paperless", dns: "paperless.hackerspace.pl" },
+ { namespace: "site", dns: "new.hackerspace.pl" },
+
+ // ops
{ namespace: "sso", dns: "sso.hackerspace.pl" },
- { namespace: "mastodon-hackerspace-qa", dns: "social-qa-2.hackerspace.pl" },
- { namespace: "mastodon-hackerspace-prod", dns: "social.hackerspace.pl" },
// auto-namespaced domains, i.e:
// USER.hscloud.ovh is allowed for personal-USER namespace
@@ -408,32 +417,28 @@
// add them to the list below.
// (system:admin-namespace role is given to <user>@hackerspace.pl)
namespaces:: {
+ // app
"inventory": [
"radex",
"palid",
],
- "walne": [
- "radex",
- "palid",
- ],
- "site": [
- "ar",
- "radex",
- ],
- "valheim": [
- "patryk",
- "palid",
- ],
"matrix-0x3c": [
"not7cd",
],
- "hswaw-prod": [
- "ar",
+ "walne": [
+ "radex",
+ "palid",
+ ],
+
+ // bgpwtf
+ "internet": [
"radex",
],
- "ldapweb": [
+ "speedtest": [
"radex",
],
+
+ // devtools
"devtools-prod": [
"radex",
],
@@ -446,21 +451,34 @@
"sourcegraph": [
"radex",
],
- "speedtest": [
- "radex",
+
+ // games
+ "valheim": [
+ "patryk",
+ "palid",
],
- "internet": [
+
+ // hswaw
+ "hswaw-prod": [
+ "ar",
"radex",
],
"cebulacamp": [
"radex",
],
- "teleimg": [
+ "ldapweb": [
"radex",
],
"pretalx": [
"radex",
],
+ "site": [
+ "ar",
+ "radex",
+ ],
+ "teleimg": [
+ "radex",
+ ],
}
}
},