wildduck: Refined Dragonfly cleanup

wildduck/haraka.yaml

@@ -177,8 +177,8 @@ spec:
             - name: REDIS_URI
               valueFrom:
                 secretKeyRef:
-                  name: dragonfly-auth
+                  name: session-storage
-                  key: REDIS_URI
+                  key: REDIS_WILDDUCK_URI
             - name: MONGO_URI
               valueFrom:
                 secretKeyRef:

wildduck/session-storage.yaml

@@ -0,0 +1,42 @@
+---
+apiVersion: codemowers.cloud/v1beta1
+kind: SecretClaim
+metadata:
+  name: session-storage
+spec:
+  size: 32
+  mapping:
+    - key: password
+      value: "%(plaintext)s"
+    - key: REDIS_WILDDUCK_URI
+      value: "redis://:%(plaintext)s@session-storage/1"
+    - key: REDIS_WEBMAIL_URI
+      value: "redis://:%(plaintext)s@session-storage/2"
+    - key: REDIS_WILDFLOCK_URI
+      value: "redis://:%(plaintext)s@session-storage/2"
+---
+apiVersion: dragonflydb.io/v1alpha1
+kind: Dragonfly
+metadata:
+  name: session-storage
+spec:
+  authentication:
+    passwordFromSecret:
+      key: password
+      name: session-storage
+  replicas: 3
+  resources:
+    limits:
+      memory: 1Gi
+---
+apiVersion: monitoring.coreos.com/v1
+kind: PodMonitor
+metadata:
+  name: session-storage
+spec:
+  selector:
+    matchLabels:
+      app: session-storage
+      app.kubernetes.io/part-of: dragonfly
+  podMetricsEndpoints:
+    - port: admin

wildduck/sessions.yaml

@@ -1,28 +0,0 @@
----
-apiVersion: codemowers.cloud/v1beta1
-kind: SecretClaim
-metadata:
-  name: dragonfly-auth
-spec:
-  size: 32
-  mapping:
-    - key: password
-      value: "%(plaintext)s"
-    - key: REDIS_WILDDUCK_URI
-      value: "redis://:%(plaintext)s@dragonfly/1"
-    - key: REDIS_WILDFLOCK_URI
-      value: "redis://:%(plaintext)s@dragonfly/2"
----
-apiVersion: dragonflydb.io/v1alpha1
-kind: Dragonfly
-metadata:
-  name: dragonfly
-spec:
-  authentication:
-    passwordFromSecret:
-      key: password
-      name: dragonfly-auth
-  replicas: 3
-  resources:
-    limits:
-      memory: 1Gi

wildduck/webmail.yaml

@@ -88,8 +88,8 @@ spec:
             - name: APPCONF_dbs_redis
               valueFrom:
                 secretKeyRef:
-                  name: dragonfly-auth
+                  name: session-storage
-                  key: REDIS_URI
+                  key: REDIS_WEBMAIL_URI
       volumes:
         - name: webmail-config
           projected:

wildduck/wildduck.yaml

@@ -92,7 +92,7 @@ spec:
             - name: APPCONF_dbs_redis
               valueFrom:
                 secretKeyRef:
-                  name: dragonfly-auth
+                  name: session-storage
                   key: REDIS_WILDDUCK_URI
           volumeMounts:
             - mountPath: /cert

wildduck/wildflock.yaml

@@ -96,7 +96,7 @@ spec:
             - name: REDIS_URL
               valueFrom:
                 secretKeyRef:
-                  name: dragonfly-auth
+                  name: session-storage
                   key: REDIS_WILDFLOCK_URI
             - name: CLIENT_URL
               value: https://wildflock.k-space.ee

wildduck/zonemta.yaml

@@ -125,8 +125,8 @@ spec:
             - name: APPCONF_dbs_redis
               valueFrom:
                 secretKeyRef:
-                  name: dragonfly-auth
+                  name: session-storage
-                  key: REDIS_URI
+                  key: REDIS_WILDDUCK_URI
           volumeMounts:
             - name: cert
               mountPath: /cert