From 7941f0f46625ea55c2d498ce98f53a01dbe3465a Mon Sep 17 00:00:00 2001
From: SeanOMik <seanomik@gmail.com>
Date: Thu, 13 Apr 2023 23:55:25 -0400
Subject: [PATCH] Use a single docker image with built-in ldap for znc

---
 cluster/apps/irc/znc/helm-release.yaml | 27 ++------------------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/cluster/apps/irc/znc/helm-release.yaml b/cluster/apps/irc/znc/helm-release.yaml
index 996738b..ba99bdf 100644
--- a/cluster/apps/irc/znc/helm-release.yaml
+++ b/cluster/apps/irc/znc/helm-release.yaml
@@ -31,23 +31,8 @@ spec:
             name: config
 
     image:
-      repository: znc
+      repository: ghcr.io/seanomik/docker-znc-ldap
       tag: latest
-
-    sidecars:
-      saslauthd-sidecar:
-        image: dweomer/saslauthd:latest
-        args: ["-a", "ldap", "-d", "1", "-O", "/znc-data/saslauthd.conf"]
-        volumeMounts:
-          - mountPath: /znc-data
-            name: config
-          - mountPath: /var/run/saslauthd
-            name: saslauthd-socket
-
-    env:
-      TZ: America/New_York
-      PGID: "1000"
-      PUID: "1000"
     
     service:
       main:
@@ -64,7 +49,7 @@ spec:
         enabled: true
         annotations:
           traefik.ingress.kubernetes.io/router.entrypoints: websecure
-          traefik.ingress.kubernetes.io/router.middlewares: traefik-authentik@kubernetescrd
+#          traefik.ingress.kubernetes.io/router.middlewares: traefik-authentik@kubernetescrd
         hosts:
           - host: &host "znc.${SECRET_NEW_DOMAIN}"
             paths:
@@ -82,14 +67,6 @@ spec:
         hostPath: /mnt/MainPool/Kubernetes/znc
         mountPath: /znc-data
 
-      # This shared directory is used to share the unix socket between znc and saslauth
-      saslauthd-socket:
-        enabled: true
-        type: emptyDir
-        mountPath: /var/run/saslauthd/
-        medium: Memory
-        sizeLimit: 512Mi # Should be way more than enough
-
     resources:
       requests:
         cpu: 1m