feat(radicale): Move to separate k8s namespace

fix(freshrss): Use correct service name
This commit is contained in:
Pim Kunis 2024-07-14 13:48:17 +02:00
parent 6dc3bef386
commit 3223347964
6 changed files with 53 additions and 52 deletions

View file

@ -68,4 +68,6 @@
"${self}/kubenix-modules/cyberchef.nix" "cyberchef" "cyberchef"; "${self}/kubenix-modules/cyberchef.nix" "cyberchef" "cyberchef";
kubenix.freshrss = mkDeployScriptAndManifest kubenix.freshrss = mkDeployScriptAndManifest
"${self}/kubenix-modules/freshrss.nix" "freshrss" "freshrss"; "${self}/kubenix-modules/freshrss.nix" "freshrss" "freshrss";
kubenix.radicale = mkDeployScriptAndManifest
"${self}/kubenix-modules/radicale.nix" "radicale" "radicale";
}) })

View file

@ -1,10 +1,7 @@
let let
applications = [ applications = [
# ./freshrss.nix
# ./cyberchef.nix
./kms.nix ./kms.nix
./inbucket.nix ./inbucket.nix
./radicale.nix
./syncthing.nix ./syncthing.nix
./nextcloud.nix ./nextcloud.nix
./pihole.nix ./pihole.nix

View file

@ -63,6 +63,7 @@
namespaces = { namespaces = {
cyberchef = { }; cyberchef = { };
freshrss = { }; freshrss = { };
radicale = { };
}; };
nodes = nodes =

View file

@ -71,7 +71,7 @@
host = "rss.kun.is"; host = "rss.kun.is";
service = { service = {
name = "web"; name = "server";
portName = "web"; portName = "web";
}; };
}; };

View file

@ -1,6 +1,6 @@
{ lib, ... }: { { lib, ... }: {
kubernetes.resources = { kubernetes.resources = {
configMaps.radicale.data = { configMaps.server.data = {
users = "pim:$apr1$GUiTihkS$dDCkaUxFx/O86m6NCy/yQ."; users = "pim:$apr1$GUiTihkS$dDCkaUxFx/O86m6NCy/yQ.";
config = lib.generators.toINI { } { config = lib.generators.toINI { } {
@ -33,10 +33,7 @@
}; };
}; };
deployments.radicale = { deployments.server.spec = {
metadata.labels.app = "radicale";
spec = {
selector.matchLabels.app = "radicale"; selector.matchLabels.app = "radicale";
strategy = { strategy = {
@ -76,8 +73,8 @@
}; };
volumes = { volumes = {
data.persistentVolumeClaim.claimName = "radicale"; data.persistentVolumeClaim.claimName = "data";
config.configMap.name = "radicale"; config.configMap.name = "server";
}; };
securityContext = { securityContext = {
@ -87,9 +84,8 @@
}; };
}; };
}; };
};
services.radicale.spec = { services.server.spec = {
selector.app = "radicale"; selector.app = "radicale";
ports.web = { ports.web = {
@ -100,13 +96,18 @@
}; };
lab = { lab = {
ingresses.radicale = { ingresses.web = {
host = "dav.kun.is"; host = "dav.kun.is";
service = { service = {
name = "radicale"; name = "server";
portName = "web"; portName = "web";
}; };
}; };
longhorn.persistentVolumeClaim.data = {
volumeName = "radicale";
storage = "200Mi";
};
}; };
} }

View file

@ -16,7 +16,6 @@
longhornVolumes = { longhornVolumes = {
hedgedoc-uploads.storage = "50Mi"; hedgedoc-uploads.storage = "50Mi";
hedgedoc-db.storage = "100Mi"; hedgedoc-db.storage = "100Mi";
radicale.storage = "200Mi";
minecraft.storage = "1Gi"; minecraft.storage = "1Gi";
nextcloud.storage = "50Gi"; nextcloud.storage = "50Gi";
nextcloud-db.storage = "400Mi"; nextcloud-db.storage = "400Mi";
@ -45,6 +44,7 @@
longhorn.persistentVolume = { longhorn.persistentVolume = {
freshrss.storage = "1Gi"; freshrss.storage = "1Gi";
radicale.storage = "200Mi";
}; };
nfsVolumes = { nfsVolumes = {