cluster

commit 688dc2849827a6b8b47712bee3b1042286e98338
parent c6457f3806e00268f73f6fc28a764d8f54f0ecad
Author: MTRNord <mtrnord1@gmail.com>
Date:   Sat, 20 Apr 2024 23:51:45 +0200

Fix redis with forgejo

Diffstat:
A
apps/base/forgejo/keydb.yaml
 | 
49
+++++++++++++++++++++++++++++++++++++++++++++++++
M
apps/base/forgejo/kustomization.yaml
 | 
1
+
M
apps/base/forgejo/release.yaml
 | 
18
++++++++++++------

3 files changed, 62 insertions(+), 6 deletions(-)
diff --git a/apps/base/forgejo/keydb.yaml b/apps/base/forgejo/keydb.yaml
@@ -0,0 +1,49 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: forgejo-keydb
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: forgejo-keydb
+  template:
+    metadata:
+      labels:
+        app: forgejo-keydb
+    spec:
+      containers:
+        - name: forgejo-keydb
+          image: eqalpha/keydb:latest
+          command: ["keydb-server"]
+          args: [ "/etc/keydb/keydb.conf", "--protected-mode", "no"]
+          imagePullPolicy: Always
+          ports:
+            - containerPort: 6379
+      tolerations:
+        - key: arch
+          operator: Equal
+          value: arm64
+          effect: NoSchedule
+      livenessProbe:
+        exec:
+          command:
+          - sh
+          - -c
+          - keydb-cli ping
+        initialDelaySeconds: 10
+        timeoutSeconds: 5
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: forgejo-keydb
+spec:
+  selector:
+    app: forgejo-keydb
+  ports:
+  - name: redis
+    protocol: TCP
+    port: 6379
+    targetPort: 6379
diff --git a/apps/base/forgejo/kustomization.yaml b/apps/base/forgejo/kustomization.yaml
@@ -5,3 +5,4 @@ resources:
   - repository.yaml
   - release.yaml
   - ssh-ingress.yaml
+  - keydb.yaml
diff --git a/apps/base/forgejo/release.yaml b/apps/base/forgejo/release.yaml
@@ -101,18 +101,24 @@ spec:
                     USER: ops@nordgedanken.dev
                     PASSWD: ENC[AES256_GCM,data:r91hn6p65iYL,iv:mL9SFDruo4b5QzTHj1X3tJcKJLOdKVW9M86Nf408JaA=,tag:y9lH8RG43QGRMVPcMO9cXw==,type:str]
                 session:
-                    PROVIDER: redis-cluster
-                    PROVIDER_CONFIG: redis+cluster://:@forgejo-redis-cluster-headless.forgejo.svc.cluster.local:6379/0?pool_size=100&idle_timeout=180s&
+                    #PROVIDER: redis-cluster
+                    PROVIDER: redis
+                    PROVIDER_CONFIG: redis://:@forgejo-keydb.forgejo.svc.cluster.local:6379/0?pool_size=100&idle_timeout=180s&
+                    #PROVIDER_CONFIG: redis+cluster://:@forgejo-redis-cluster-headless.forgejo.svc.cluster.local:6379/0?pool_size=100&idle_timeout=180s&
 
                 cache:
                     ENABLED: true
-                    ADAPTER: redis-cluster
-                    HOST: redis+cluster://:@forgejo-redis-cluster-headless.forgejo.svc.cluster.local:6379/0?pool_size=100&idle_timeout=180s&
+                    ADAPTER: redis
+                    #ADAPTER: redis-cluster
+                    #HOST: redis+cluster://:@forgejo-redis-cluster-headless.forgejo.svc.cluster.local:6379/0?pool_size=100&idle_timeout=180s&
+                    HOST: redis://:@forgejo-keydb.forgejo.svc.cluster.local:6379/0?pool_size=100&idle_timeout=180s&
 
                 queue:
                     TYPE: redis
-                    CONN_STR: redis+cluster://:@forgejo-redis-cluster-headless.forgejo.svc.cluster.local:6379/0?pool_size=100&idle_timeout=180s&
-        #redis-cluster:
+                    #CONN_STR: redis+cluster://:@forgejo-redis-cluster-headless.forgejo.svc.cluster.local:6379/0?pool_size=100&idle_timeout=180s&
+                    CONN_STR: redis://:@forgejo-keydb.forgejo.svc.cluster.local:6379/0?pool_size=100&idle_timeout=180s&
+        redis-cluster:
+            enable: false
         #    networkPolicy:
         #        enabled: false
         postgresql-ha: