Swap to Redict where possible, minor refactoring

This commit is contained in:
Gabriel Simmer 2024-06-22 22:56:41 +01:00
parent 88be070f1d
commit 0832307fc3
Signed by: arch
SSH key fingerprint: SHA256:m3OEcdtrnBpMX+2BDGh/byv3hrCekCLzDYMdvGEKPPQ
5 changed files with 25 additions and 4 deletions

View file

@ -19,6 +19,7 @@
immich.persistence.library.existingClaim = "immich"; immich.persistence.library.existingClaim = "immich";
redis = { redis = {
enabled = true; enabled = true;
}; };
env = { env = {
PGSSLMODE = "no-verify"; PGSSLMODE = "no-verify";
@ -58,4 +59,9 @@
resources.requests.storage = "50Gi"; resources.requests.storage = "50Gi";
}; };
}; };
kubernetes.resources.statefulSets.immich-redis-master = {
metadata.namespace = "immich";
spec.template.spec.containers.redis.image = lib.mkForce "registry.redict.io/redict:7.3-compat";
};
} }

View file

@ -2,7 +2,12 @@ let
appName = "soju"; appName = "soju";
sojuImage = "git.gmem.ca/arch/soju:latest"; sojuImage = "git.gmem.ca/arch/soju:latest";
gamjaImage = "git.gmem.ca/arch/gamja:latest"; gamjaImage = "git.gmem.ca/arch/gamja:latest";
in { in {
lib,
config,
kubenix,
...
}: {
kubernetes.resources.services.soju = { kubernetes.resources.services.soju = {
metadata.namespace = "irc"; metadata.namespace = "irc";
spec = { spec = {
@ -43,7 +48,7 @@ in {
metadata.labels.app = appName; metadata.labels.app = appName;
spec = { spec = {
volumes = { volumes = {
config.configMap.name = "soju"; config.configMap.name = config.kubernetes.resources.configMaps.soju.metadata.name;
ssl.secret.secretName = "irc-gmem-ca"; ssl.secret.secretName = "irc-gmem-ca";
}; };
containers = { containers = {

View file

@ -21,7 +21,7 @@ in
image = appImage; image = appImage;
envFrom = [ envFrom = [
{secretRef.name = "nitter-bot";} {secretRef.name = "nitter-bot";}
{configMapRef.name = "nitter-bot";} {configMapRef.name = config.kubernetes.resources.configMaps.nitter-bot.metadata.name;}
]; ];
resources = { resources = {
requests = { requests = {

View file

@ -84,6 +84,11 @@ in
values = { values = {
auth.enabled = false; auth.enabled = false;
architecture = "standalone"; architecture = "standalone";
image = {
registry = "registry.redict.io";
repository = "redict";
tag = "7.3-compat";
};
}; };
}; };
kubernetes.resources.ingresses.nitter = { kubernetes.resources.ingresses.nitter = {

View file

@ -27,7 +27,7 @@ in
metadata.labels.app = appName; metadata.labels.app = appName;
spec = { spec = {
volumes = { volumes = {
config.configMap.name = "searxng"; config.configMap.name = config.kubernetes.resources.configMaps.searxng.metadata.name;
}; };
containers = { containers = {
searxng = { searxng = {
@ -104,6 +104,11 @@ in
values = { values = {
auth.enabled = false; auth.enabled = false;
architecture = "standalone"; architecture = "standalone";
image = {
registry = "registry.redict.io";
repository = "redict";
tag = "7.3-compat";
};
}; };
}; };