switch redis

clusters/cl01tl/services/blocky/Chart.yaml

@@ -8,10 +8,8 @@ keywords:
 home: https://wiki.alexlebens.dev/s/cf70113d-20bc-48ad-afb8-1e22ed3fd62a
 sources:
   - https://github.com/0xERR0R/blocky
-  - https://github.com/valkey-io/valkey
   - https://hub.docker.com/r/spx01/blocky
   - https://github.com/bjw-s-labs/helm-charts/tree/main/charts/other/app-template
-  - https://github.com/bitnami/charts/tree/main/bitnami/valkey
 maintainers:
   - name: alexlebens
 dependencies:
@@ -19,8 +17,5 @@ dependencies:
     alias: blocky
     repository: https://bjw-s-labs.github.io/helm-charts/
     version: 4.2.0
-  - name: valkey
-    version: 3.0.22
-    repository: oci://harbor.alexlebens.net/proxy-registry-1.docker.io/bitnamicharts
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/blocky.png
 appVersion: v0.25

clusters/cl01tl/services/blocky/templates/redis-replication.yaml

@@ -0,0 +1,32 @@
+apiVersion: redis.redis.opstreelabs.in/v1beta2
+kind: RedisReplication
+metadata:
+  name: redis-replication-blocky
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: redis-replication-blocky
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+spec:
+  clusterSize: 3
+  podSecurityContext:
+    runAsUser: 1000
+    fsGroup: 1000
+  kubernetesConfig:
+    image: quay.io/opstree/redis:v8.0.3
+    imagePullPolicy: IfNotPresent
+    resources:
+      requests:
+        cpu: 50m
+        memory: 128Mi
+  storage:
+    volumeClaimTemplate:
+      spec:
+        storageClassName: ceph-block
+        accessModes: ["ReadWriteOnce"]
+        resources:
+          requests:
+            storage: 1Gi
+  redisExporter:
+    enabled: true
+    image: quay.io/opstree/redis-exporter:v1.48.0

clusters/cl01tl/services/blocky/templates/service-monitor.yaml

@@ -17,3 +17,24 @@ spec:
       interval: 30s
       scrapeTimeout: 10s
       path: /metrics
+
+---
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: redis-replication-blocky
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: redis-replication-blocky
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+    redis-operator: "true"
+    env: production
+spec:
+  selector:
+    matchLabels:
+      redis_setup_type: replication
+  endpoints:
+    - port: redis-exporter
+      interval: 30s
+      scrapeTimeout: 10s

clusters/cl01tl/services/blocky/values.yaml

@@ -237,7 +237,7 @@ blocky:
             cacheTimeNegative: 30m
 
           redis:
-            address: blocky-valkey-primary.blocky:6379
+            address: redis-replication-blocky-master.blocky:6379
             required: true
 
           prometheus:
@@ -297,25 +297,3 @@ blocky:
               readOnly: true
               mountPropagation: None
               subPath: config.yml
-valkey:
-  architecture: replication
-  auth:
-    enabled: false
-    usePasswordFiles: false
-  primary:
-    resources:
-      requests:
-        cpu: 100m
-        memory: 64Mi
-    persistence:
-      enabled: true
-      size: 1Gi
-  replica:
-    replicaCount: 1
-    resources:
-      requests:
-        cpu: 100m
-        memory: 64Mi
-    persistence:
-      enabled: true
-      size: 1Gi