wildduck/sessions.yaml

@@ -0,0 +1,28 @@
+---
+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

@@ -1,13 +1,3 @@
-# ---
-# Commented out by argocd config drift
-#
-# apiVersion: codemowers.cloud/v1beta1
-# kind: RedisClaim
-# metadata:
-#   name: webmail
-# spec:
-#   class: ephemeral
-#   capacity: 100Mi
 ---
 apiVersion: codemowers.cloud/v1beta1
 kind: OIDCMiddlewareClient
@@ -156,24 +146,3 @@ spec:
     regex: ^https://webmail.k-space.ee/$
     replacement: https://webmail.k-space.ee/webmail/
     permanent: false
-# ---
-# apiVersion: networking.k8s.io/v1
-# kind: NetworkPolicy
-# metadata:
-#   name: webmail
-# spec:
-#   podSelector:
-#     matchLabels:
-#       app.kubernetes.io/name: webmail
-#   policyTypes:
-#     - Ingress
-#   ingress:
-#     - ports:
-#         - port: 3000
-#       from:
-#         - namespaceSelector:
-#             matchLabels:
-#               kubernetes.io/metadata.name: traefik
-#           podSelector:
-#             matchLabels:
-#               app.kubernetes.io/name: traefik

wildduck/wildduck.yaml

@@ -1,30 +1,4 @@
 ---
-apiVersion: codemowers.cloud/v1beta1
-kind: SecretClaim
-metadata:
-  name: dragonfly-auth
-spec:
-  size: 32
-  mapping:
-    - key: password
-      value: "%(plaintext)s"
-    - key: REDIS_URI
-      value: "redis://:%(plaintext)s@dragonfly"
----
-apiVersion: dragonflydb.io/v1alpha1
-kind: Dragonfly
-metadata:
-  name: dragonfly
-spec:
-  authentication:
-    passwordFromSecret:
-      key: password
-      name: dragonfly-auth
-  replicas: 3
-  resources:
-    limits:
-      memory: 5Gi
----
 apiVersion: v1
 kind: Service
 metadata:
@@ -119,7 +93,7 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: dragonfly-auth
-                  key: REDIS_URI
+                  key: REDIS_WILDDUCK_URI
           volumeMounts:
             - mountPath: /cert
               name: cert

wildduck/wildflock.yaml

@@ -96,8 +96,8 @@ spec:
             - name: REDIS_URL
               valueFrom:
                 secretKeyRef:
-                  name: dragonfly-wildflock-auth
-                  key: REDIS_URI
+                  name: dragonfly-auth
+                  key: REDIS_WILDFLOCK_URI
             - name: CLIENT_URL
               value: https://wildflock.k-space.ee
             - name: WILDDUCK_DOMAIN
@@ -139,29 +139,3 @@ spec:
           envFrom:
             - secretRef:
                 name: oidc-client-wildflock-owner-secrets
----
-apiVersion: codemowers.cloud/v1beta1
-kind: SecretClaim
-metadata:
-  name: dragonfly-wildflock-auth
-spec:
-  size: 32
-  mapping:
-    - key: password
-      value: "%(plaintext)s"
-    - key: REDIS_URI
-      value: "redis://:%(plaintext)s@dragonfly-wildflock"
----
-apiVersion: dragonflydb.io/v1alpha1
-kind: Dragonfly
-metadata:
-  name: dragonfly-wildflock
-spec:
-  authentication:
-    passwordFromSecret:
-      key: password
-      name: dragonfly-wildflock-auth
-  replicas: 3
-  resources:
-    limits:
-      memory: 5Gi