Redo k3s-master once more

42 files changed, 32 insertions, 26 deletions

diff --git a/.gitmodules b/.gitmodules
index e3fe95e..ae999ae 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,8 +5,5 @@
 	path = playbooks.d/vpn-tinc
 	url = https://git.tyil.nl/bashtard/vpn-tinc
 [submodule "playbooks.d/k3s-hurzak"]
-	path = playbooks.d/k3s-hurzak
-	url = https://git.tyil.nl/bashtard/k3s-master
-[submodule "playbooks.d/k3s-jaomox"]
-	path = playbooks.d/k3s-jaomox
+	path = playbooks.d/k3s-master
 	url = https://git.tyil.nl/bashtard/k3s-master
diff --git a/data.d/k3s-hurzak/helm.d/certmanager.yaml b/data.d/k3s-master/helm.d/certmanager.yaml
index 1b4551c..1b4551c 100644
--- a/data.d/k3s-hurzak/helm.d/certmanager.yaml
+++ b/data.d/k3s-master/helm.d/certmanager.yaml
diff --git a/data.d/k3s-jaomox/helm.d/minio.yaml b/data.d/k3s-master/helm.d/minio.yaml
index e2f3b8b..e2f3b8b 100644
--- a/data.d/k3s-jaomox/helm.d/minio.yaml
+++ b/data.d/k3s-master/helm.d/minio.yaml
diff --git a/data.d/k3s-hurzak/helm.d/redis.yaml b/data.d/k3s-master/helm.d/redis.yaml
index 4dc9703..4dc9703 100644
--- a/data.d/k3s-hurzak/helm.d/redis.yaml
+++ b/data.d/k3s-master/helm.d/redis.yaml
diff --git a/data.d/k3s-hurzak/manifests.d/base-system/certmanager/letsencrypt-production.yaml b/data.d/k3s-master/manifests.d/hurzak/base-system/certmanager/letsencrypt-production.yaml
index dbff2c2..dbff2c2 100644
--- a/data.d/k3s-hurzak/manifests.d/base-system/certmanager/letsencrypt-production.yaml
+++ b/data.d/k3s-master/manifests.d/hurzak/base-system/certmanager/letsencrypt-production.yaml
diff --git a/data.d/k3s-hurzak/manifests.d/base-system/certmanager/letsencrypt-staging.yaml b/data.d/k3s-master/manifests.d/hurzak/base-system/certmanager/letsencrypt-staging.yaml
index 9b0a27d..9b0a27d 100644
--- a/data.d/k3s-hurzak/manifests.d/base-system/certmanager/letsencrypt-staging.yaml
+++ b/data.d/k3s-master/manifests.d/hurzak/base-system/certmanager/letsencrypt-staging.yaml
diff --git a/data.d/k3s-hurzak/manifests.d/namespaces.yaml b/data.d/k3s-master/manifests.d/hurzak/namespaces.yaml
index aab254a..aab254a 100644
--- a/data.d/k3s-hurzak/manifests.d/namespaces.yaml
+++ b/data.d/k3s-master/manifests.d/hurzak/namespaces.yaml
diff --git a/data.d/k3s-hurzak/manifests.d/personal-services/keycloak/deployment.yaml b/data.d/k3s-master/manifests.d/hurzak/personal-services/keycloak/deployment.yaml
index 5cd9975..5cd9975 100644
--- a/data.d/k3s-hurzak/manifests.d/personal-services/keycloak/deployment.yaml
+++ b/data.d/k3s-master/manifests.d/hurzak/personal-services/keycloak/deployment.yaml
diff --git a/data.d/k3s-hurzak/manifests.d/personal-services/keycloak/ingress.yaml b/data.d/k3s-master/manifests.d/hurzak/personal-services/keycloak/ingress.yaml
index 40e6d22..40e6d22 100644
--- a/data.d/k3s-hurzak/manifests.d/personal-services/keycloak/ingress.yaml
+++ b/data.d/k3s-master/manifests.d/hurzak/personal-services/keycloak/ingress.yaml
diff --git a/data.d/k3s-hurzak/manifests.d/personal-services/keycloak/sealed-secret.yaml b/data.d/k3s-master/manifests.d/hurzak/personal-services/keycloak/sealed-secret.yaml
index acda853..acda853 100644
--- a/data.d/k3s-hurzak/manifests.d/personal-services/keycloak/sealed-secret.yaml
+++ b/data.d/k3s-master/manifests.d/hurzak/personal-services/keycloak/sealed-secret.yaml
diff --git a/data.d/k3s-hurzak/manifests.d/personal-services/keycloak/service.yaml b/data.d/k3s-master/manifests.d/hurzak/personal-services/keycloak/service.yaml
index c9068b7..c9068b7 100644
--- a/data.d/k3s-hurzak/manifests.d/personal-services/keycloak/service.yaml
+++ b/data.d/k3s-master/manifests.d/hurzak/personal-services/keycloak/service.yaml
diff --git a/data.d/k3s-hurzak/manifests.d/personal-services/uptime-kuma/deployment.yaml b/data.d/k3s-master/manifests.d/hurzak/personal-services/uptime-kuma/deployment.yaml
index 9553007..9553007 100644
--- a/data.d/k3s-hurzak/manifests.d/personal-services/uptime-kuma/deployment.yaml
+++ b/data.d/k3s-master/manifests.d/hurzak/personal-services/uptime-kuma/deployment.yaml
diff --git a/data.d/k3s-hurzak/manifests.d/personal-services/uptime-kuma/ingress.yaml b/data.d/k3s-master/manifests.d/hurzak/personal-services/uptime-kuma/ingress.yaml
index 66eb258..66eb258 100644
--- a/data.d/k3s-hurzak/manifests.d/personal-services/uptime-kuma/ingress.yaml
+++ b/data.d/k3s-master/manifests.d/hurzak/personal-services/uptime-kuma/ingress.yaml
diff --git a/data.d/k3s-hurzak/manifests.d/personal-services/uptime-kuma/service.yaml b/data.d/k3s-master/manifests.d/hurzak/personal-services/uptime-kuma/service.yaml
index 51d6d53..51d6d53 100644
--- a/data.d/k3s-hurzak/manifests.d/personal-services/uptime-kuma/service.yaml
+++ b/data.d/k3s-master/manifests.d/hurzak/personal-services/uptime-kuma/service.yaml
diff --git a/data.d/k3s-hurzak/manifests.d/public-services/invidious/deployment.yaml b/data.d/k3s-master/manifests.d/hurzak/public-services/invidious/deployment.yaml
index 66c7912..66c7912 100644
--- a/data.d/k3s-hurzak/manifests.d/public-services/invidious/deployment.yaml
+++ b/data.d/k3s-master/manifests.d/hurzak/public-services/invidious/deployment.yaml
diff --git a/data.d/k3s-hurzak/manifests.d/public-services/invidious/ingress.yaml b/data.d/k3s-master/manifests.d/hurzak/public-services/invidious/ingress.yaml
index cb675a9..cb675a9 100644
--- a/data.d/k3s-hurzak/manifests.d/public-services/invidious/ingress.yaml
+++ b/data.d/k3s-master/manifests.d/hurzak/public-services/invidious/ingress.yaml
diff --git a/data.d/k3s-hurzak/manifests.d/public-services/invidious/sealed-secret.yaml b/data.d/k3s-master/manifests.d/hurzak/public-services/invidious/sealed-secret.yaml
index 013d172..013d172 100644
--- a/data.d/k3s-hurzak/manifests.d/public-services/invidious/sealed-secret.yaml
+++ b/data.d/k3s-master/manifests.d/hurzak/public-services/invidious/sealed-secret.yaml
diff --git a/data.d/k3s-hurzak/manifests.d/public-services/invidious/service.yaml b/data.d/k3s-master/manifests.d/hurzak/public-services/invidious/service.yaml
index e4f95be..e4f95be 100644
--- a/data.d/k3s-hurzak/manifests.d/public-services/invidious/service.yaml
+++ b/data.d/k3s-master/manifests.d/hurzak/public-services/invidious/service.yaml
diff --git a/data.d/k3s-hurzak/manifests.d/public-services/nitter/deployment.yaml b/data.d/k3s-master/manifests.d/hurzak/public-services/nitter/deployment.yaml
index 8ad6401..8ad6401 100644
--- a/data.d/k3s-hurzak/manifests.d/public-services/nitter/deployment.yaml
+++ b/data.d/k3s-master/manifests.d/hurzak/public-services/nitter/deployment.yaml
diff --git a/data.d/k3s-hurzak/manifests.d/public-services/nitter/ingress.yaml b/data.d/k3s-master/manifests.d/hurzak/public-services/nitter/ingress.yaml
index 6c3e671..6c3e671 100644
--- a/data.d/k3s-hurzak/manifests.d/public-services/nitter/ingress.yaml
+++ b/data.d/k3s-master/manifests.d/hurzak/public-services/nitter/ingress.yaml
diff --git a/data.d/k3s-hurzak/manifests.d/public-services/nitter/sealed-secret.yaml b/data.d/k3s-master/manifests.d/hurzak/public-services/nitter/sealed-secret.yaml
index ab6cf1b..ab6cf1b 100644
--- a/data.d/k3s-hurzak/manifests.d/public-services/nitter/sealed-secret.yaml
+++ b/data.d/k3s-master/manifests.d/hurzak/public-services/nitter/sealed-secret.yaml
diff --git a/data.d/k3s-hurzak/manifests.d/public-services/nitter/service.yaml b/data.d/k3s-master/manifests.d/hurzak/public-services/nitter/service.yaml
index f9bba4b..f9bba4b 100644
--- a/data.d/k3s-hurzak/manifests.d/public-services/nitter/service.yaml
+++ b/data.d/k3s-master/manifests.d/hurzak/public-services/nitter/service.yaml
diff --git a/data.d/k3s-hurzak/manifests.d/public-services/omgur/deployment.yaml b/data.d/k3s-master/manifests.d/hurzak/public-services/omgur/deployment.yaml
index 2cef276..2cef276 100644
--- a/data.d/k3s-hurzak/manifests.d/public-services/omgur/deployment.yaml
+++ b/data.d/k3s-master/manifests.d/hurzak/public-services/omgur/deployment.yaml
diff --git a/data.d/k3s-hurzak/manifests.d/public-services/omgur/ingress.yaml b/data.d/k3s-master/manifests.d/hurzak/public-services/omgur/ingress.yaml
index b8d7e1a..b8d7e1a 100644
--- a/data.d/k3s-hurzak/manifests.d/public-services/omgur/ingress.yaml
+++ b/data.d/k3s-master/manifests.d/hurzak/public-services/omgur/ingress.yaml
diff --git a/data.d/k3s-hurzak/manifests.d/public-services/omgur/service.yaml b/data.d/k3s-master/manifests.d/hurzak/public-services/omgur/service.yaml
index f848c14..f848c14 100644
--- a/data.d/k3s-hurzak/manifests.d/public-services/omgur/service.yaml
+++ b/data.d/k3s-master/manifests.d/hurzak/public-services/omgur/service.yaml
diff --git a/data.d/k3s-hurzak/manifests.d/public-services/searxng/deployment.yaml b/data.d/k3s-master/manifests.d/hurzak/public-services/searxng/deployment.yaml
index f5f6064..f5f6064 100644
--- a/data.d/k3s-hurzak/manifests.d/public-services/searxng/deployment.yaml
+++ b/data.d/k3s-master/manifests.d/hurzak/public-services/searxng/deployment.yaml
diff --git a/data.d/k3s-hurzak/manifests.d/public-services/searxng/ingress.yaml b/data.d/k3s-master/manifests.d/hurzak/public-services/searxng/ingress.yaml
index 0b8fe62..0b8fe62 100644
--- a/data.d/k3s-hurzak/manifests.d/public-services/searxng/ingress.yaml
+++ b/data.d/k3s-master/manifests.d/hurzak/public-services/searxng/ingress.yaml
diff --git a/data.d/k3s-hurzak/manifests.d/public-services/searxng/service.yaml b/data.d/k3s-master/manifests.d/hurzak/public-services/searxng/service.yaml
index 23fb8ac..23fb8ac 100644
--- a/data.d/k3s-hurzak/manifests.d/public-services/searxng/service.yaml
+++ b/data.d/k3s-master/manifests.d/hurzak/public-services/searxng/service.yaml
diff --git a/data.d/k3s-hurzak/manifests.d/public-services/teddit/deployment.yaml b/data.d/k3s-master/manifests.d/hurzak/public-services/teddit/deployment.yaml
index 9542cde..9542cde 100644
--- a/data.d/k3s-hurzak/manifests.d/public-services/teddit/deployment.yaml
+++ b/data.d/k3s-master/manifests.d/hurzak/public-services/teddit/deployment.yaml
diff --git a/data.d/k3s-hurzak/manifests.d/public-services/teddit/ingress.yaml b/data.d/k3s-master/manifests.d/hurzak/public-services/teddit/ingress.yaml
index 4830961..4830961 100644
--- a/data.d/k3s-hurzak/manifests.d/public-services/teddit/ingress.yaml
+++ b/data.d/k3s-master/manifests.d/hurzak/public-services/teddit/ingress.yaml
diff --git a/data.d/k3s-hurzak/manifests.d/public-services/teddit/service.yaml b/data.d/k3s-master/manifests.d/hurzak/public-services/teddit/service.yaml
index b91c1d1..b91c1d1 100644
--- a/data.d/k3s-hurzak/manifests.d/public-services/teddit/service.yaml
+++ b/data.d/k3s-master/manifests.d/hurzak/public-services/teddit/service.yaml
diff --git a/data.d/k3s-jaomox/manifests.d/namespaces.yaml b/data.d/k3s-master/manifests.d/jaomox/namespaces.yaml
index f9151e9..2211e87 100644
--- a/data.d/k3s-jaomox/manifests.d/namespaces.yaml
+++ b/data.d/k3s-master/manifests.d/jaomox/namespaces.yaml
@@ -2,5 +2,11 @@
 apiVersion: v1
 kind: Namespace
 metadata:
+  name: base-system
+...
+---
+apiVersion: v1
+kind: Namespace
+metadata:
   name: personal-services
 ...
diff --git a/data.d/k3s-jaomox/manifests.d/personal-services/minio/persistent-volume-claim.yaml b/data.d/k3s-master/manifests.d/jaomox/personal-services/minio/persistent-volume-claim.yaml
index fdb42dc..fdb42dc 100644
--- a/data.d/k3s-jaomox/manifests.d/personal-services/minio/persistent-volume-claim.yaml
+++ b/data.d/k3s-master/manifests.d/jaomox/personal-services/minio/persistent-volume-claim.yaml
diff --git a/data.d/k3s-jaomox/manifests.d/personal-services/minio/persistent-volume.yaml b/data.d/k3s-master/manifests.d/jaomox/personal-services/minio/persistent-volume.yaml
index 45434e8..45434e8 100644
--- a/data.d/k3s-jaomox/manifests.d/personal-services/minio/persistent-volume.yaml
+++ b/data.d/k3s-master/manifests.d/jaomox/personal-services/minio/persistent-volume.yaml
diff --git a/defaults b/defaults
index 78ab9b5..10e0fd8 100644
--- a/defaults
+++ b/defaults
@@ -7,6 +7,10 @@ dns.upstream.1=188.68.231.82
 dns.upstream.2=51.83.172.84
 dns.upstream.3=2a03:94e0:1804::1
 dns.upstream.4=2001:470:71:6dc::53
+k3s-master.helm.repos.jetstack.url=https://charts.jetstack.io
+k3s-master.helm.apps.certmanager.chart=jetstack/cert-manager
+k3s-master.helm.apps.certmanager.namespace=base-system
+k3s-master.helm.apps.certmanager.values=certmanager.yaml
 vpn-tinc.name=tyilnet
 www-blog.generator=hugo
 www-blog.path=/var/www/nl.tyil.www
diff --git a/hosts.d/hurzak.tyil.net b/hosts.d/hurzak.tyil.net
index e926555..9c781c0 100644
--- a/hosts.d/hurzak.tyil.net
+++ b/hosts.d/hurzak.tyil.net
@@ -5,20 +5,17 @@ bashtard.backup.repositories.1=rsync.net:{fqdn}
 bashtard.ssh.host=10.57.20.7
 meta.provider=leaseweb
 vpn-tinc.ipv4=10.57.20.7
-k3s-hurzak.helm.repos.sealed-secrets.url=https://bitnami-labs.github.io/sealed-secrets
-k3s-hurzak.helm.repos.jetstack.url=https://charts.jetstack.io
-k3s-hurzak.helm.repos.bitnami.url=https://charts.bitnami.com/bitnami
-k3s-hurzak.helm.apps.sealedsecrets.chart=sealed-secrets/sealed-secrets
-k3s-hurzak.helm.apps.sealedsecrets.namespace=base-system
-k3s-hurzak.helm.apps.certmanager.chart=jetstack/cert-manager
-k3s-hurzak.helm.apps.certmanager.namespace=base-system
-k3s-hurzak.helm.apps.certmanager.values=certmanager.yaml
-k3s-hurzak.helm.apps.redis-nitter.chart=bitnami/redis
-k3s-hurzak.helm.apps.redis-nitter.namespace=public-services
-k3s-hurzak.helm.apps.redis-nitter.values=redis.yaml
-k3s-hurzak.helm.apps.redis-omgur.chart=bitnami/redis
-k3s-hurzak.helm.apps.redis-omgur.namespace=public-services
-k3s-hurzak.helm.apps.redis-omgur.values=redis.yaml
-k3s-hurzak.helm.apps.redis-teddit.chart=bitnami/redis
-k3s-hurzak.helm.apps.redis-teddit.namespace=public-services
-k3s-hurzak.helm.apps.redis-teddit.values=redis.yaml
+k3s-master.manifest-prefix=hurzak
+k3s-master.helm.repos.sealed-secrets.url=https://bitnami-labs.github.io/sealed-secrets
+k3s-master.helm.repos.bitnami.url=https://charts.bitnami.com/bitnami
+k3s-master.helm.apps.sealedsecrets.chart=sealed-secrets/sealed-secrets
+k3s-master.helm.apps.sealedsecrets.namespace=base-system
+k3s-master.helm.apps.redis-nitter.chart=bitnami/redis
+k3s-master.helm.apps.redis-nitter.namespace=public-services
+k3s-master.helm.apps.redis-nitter.values=redis.yaml
+k3s-master.helm.apps.redis-omgur.chart=bitnami/redis
+k3s-master.helm.apps.redis-omgur.namespace=public-services
+k3s-master.helm.apps.redis-omgur.values=redis.yaml
+k3s-master.helm.apps.redis-teddit.chart=bitnami/redis
+k3s-master.helm.apps.redis-teddit.namespace=public-services
+k3s-master.helm.apps.redis-teddit.values=redis.yaml
diff --git a/hosts.d/jaomox.tyil.net b/hosts.d/jaomox.tyil.net
index 01eec06..d39abc0 100644
--- a/hosts.d/jaomox.tyil.net
+++ b/hosts.d/jaomox.tyil.net
@@ -5,7 +5,8 @@ bashtard.backup.repositories.1=rsync.net:{fqdn}
 bashtard.ssh.host=10.57.21.1
 meta.provider=self
 vpn-tinc.ipv4=10.57.21.1
-k3s-jaomox.helm.repos.minio.url=https://charts.min.io/
-k3s-jaomox.helm.apps.minio.chart=minio/minio
-k3s-jaomox.helm.apps.minio.namespace=personal-services
-k3s-jaomox.helm.apps.minio.values=minio.yaml
+k3s-master.manifest-prefix=jaomox
+k3s-master.helm.repos.minio.url=https://charts.min.io/
+k3s-master.helm.apps.minio.chart=minio/minio
+k3s-master.helm.apps.minio.namespace=personal-services
+k3s-master.helm.apps.minio.values=minio.yaml
diff --git a/playbooks.d/k3s-hurzak b/playbooks.d/k3s-hurzak
deleted file mode 160000
-Subproject 09191e3eb172759619aefab5373abccbc551320
diff --git a/playbooks.d/k3s-jaomox b/playbooks.d/k3s-jaomox
deleted file mode 160000
-Subproject e7d5c8e1e135b93762b5e8ca6f53077c6d2cc23
diff --git a/playbooks.d/k3s-master b/playbooks.d/k3s-master
new file mode 160000
+Subproject 00e7ed1c2e5c4cd26aa91fe4e020b301250e252
diff --git a/registry.d/hurzak.tyil.net b/registry.d/hurzak.tyil.net
index 286ffa2..2e7ea04 100644
--- a/registry.d/hurzak.tyil.net
+++ b/registry.d/hurzak.tyil.net
@@ -1,4 +1,4 @@
-k3s-hurzak
+k3s-master
 ssh
 user-tyil
 vpn-tinc
diff --git a/registry.d/jaomox.tyil.net b/registry.d/jaomox.tyil.net
index c3910de..2e7ea04 100644
--- a/registry.d/jaomox.tyil.net
+++ b/registry.d/jaomox.tyil.net
@@ -1,3 +1,4 @@
+k3s-master
 ssh
 user-tyil
 vpn-tinc