Update ghcr.io/moghtech/komodo-core Docker tag to v1.18.4

clusters/cl01tl/applications/directus/templates/external-secret.yaml

@@ -64,36 +64,6 @@ spec:
         metadataPolicy: None
         property: metric-token
 
----
-apiVersion: external-secrets.io/v1
-kind: ExternalSecret
-metadata:
-  name: directus-valkey-config
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: directus-valkey-config
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
-spec:
-  secretStoreRef:
-    kind: ClusterSecretStore
-    name: vault
-  data:
-    - secretKey: user
-      remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
-        key: /cl01tl/directus/valkey
-        metadataPolicy: None
-        property: user
-    - secretKey: password
-      remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
-        key: /cl01tl/directus/valkey
-        metadataPolicy: None
-        property: password
-
 ---
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret

clusters/cl01tl/management/komodo/values.yaml

@@ -9,7 +9,7 @@ komodo:
         main:
           image:
             repository: ghcr.io/moghtech/komodo-core
-            tag: 1.17.5
+            tag: 1.18.4
             pullPolicy: IfNotPresent
           env:
             - name: COMPOSE_LOGGING_DRIVER

clusters/cl01tl/platform/gitea/Chart.yaml

@@ -12,7 +12,6 @@ sources:
   - https://github.com/renovatebot/renovate
   - https://github.com/Angatar/s3cmd
   - https://github.com/meilisearch/meilisearch
-  - https://github.com/valkey-io/valkey
   - https://github.com/cloudflare/cloudflared
   - https://github.com/cloudnative-pg/cloudnative-pg
   - https://hub.docker.com/r/gitea/gitea
@@ -21,7 +20,6 @@ sources:
   - https://gitea.com/gitea/helm-chart
   - https://github.com/bjw-s-labs/helm-charts/tree/main/charts/other/app-template
   - https://github.com/meilisearch/meilisearch-kubernetes/tree/main/charts/meilisearch
-  - https://github.com/bitnami/charts/tree/main/bitnami/valkey
   - https://gitea.alexlebens.dev/alexlebens/helm-charts/src/branch/main/charts/cloudflared
   - https://gitea.alexlebens.dev/alexlebens/helm-charts/src/branch/main/charts/postgres-cluster
 maintainers:
@@ -40,13 +38,6 @@ dependencies:
   - name: meilisearch
     version: 0.14.0
     repository: https://meilisearch.github.io/meilisearch-kubernetes
-  - name: valkey
-    version: 3.0.22
-    repository: oci://harbor.alexlebens.net/proxy-registry-1.docker.io/bitnamicharts
-  - name: valkey
-    alias: valkey-renovate
-    version: 3.0.22
-    repository: oci://harbor.alexlebens.net/proxy-registry-1.docker.io/bitnamicharts
   - name: cloudflared
     alias: cloudflared
     repository: oci://harbor.alexlebens.net/helm-charts

clusters/cl01tl/platform/gitea/values.yaml

@@ -76,13 +76,13 @@ gitea:
       cache:
         ENABLED: true
         ADAPTER: redis
-        HOST: redis://gitea-valkey-primary.gitea:6379
+        HOST: redis://redis-replication-gitea-master.gitea:6379
       queue:
         TYPE: redis
-        CONN_STR: redis://gitea-valkey-primary.gitea:6379
+        CONN_STR: redis://redis-replication-gitea-master.gitea:6379
       session:
         PROVIDER: redis
-        PROVIDER_CONFIG: redis://gitea-valkey-primary.gitea:6379
+        PROVIDER_CONFIG: redis://redis-replication-gitea-master.gitea:6379
       indexer:
         ISSUE_INDEXER_ENABLED: true
         ISSUE_INDEXER_TYPE: meilisearch
@@ -311,40 +311,6 @@ meilisearch:
       memory: 128Mi
   serviceMonitor:
     enabled: true
-valkey:
-  architecture: replication
-  auth:
-    enabled: false
-    usePasswordFiles: false
-  primary:
-    resources:
-      requests:
-        cpu: 100m
-        memory: 64Mi
-    persistence:
-      enabled: true
-      size: 5Gi
-  replica:
-    resources:
-      requests:
-        cpu: 100m
-        memory: 64Mi
-    persistence:
-      enabled: true
-      size: 5Gi
-valkey-renovate:
-  nameOverride: renovate-valkey
-  architecture: standalone
-  auth:
-    enabled: false
-  primary:
-    resources:
-      requests:
-        cpu: 100m
-        memory: 64Mi
-    persistence:
-      enabled: true
-      size: 1Gi
 cloudflared:
   existingSecretName: gitea-cloudflared-secret
 postgres-17-cluster:

clusters/cl01tl/platform/matrix-synapse/Chart.yaml

@@ -16,7 +16,6 @@ sources:
   - https://github.com/matrix-org/matrix-hookshot
   - https://github.com/mautrix/discord
   - https://github.com/mautrix/whatsapp
-  - https://github.com/valkey-io/valkey
   - https://github.com/cloudflare/cloudflared
   - https://github.com/cloudnative-pg/cloudnative-pg
   - https://hub.docker.com/r/halfshot/matrix-hookshot
@@ -24,7 +23,6 @@ sources:
   - https://mau.dev/mautrix/whatsapp/container_registry
   - https://gitlab.com/ananace/charts/-/tree/master/charts/matrix-synapse
   - https://github.com/bjw-s-labs/helm-charts/tree/main/charts/other/app-template
-  - https://github.com/bitnami/charts/tree/main/bitnami/valkey
   - https://gitea.alexlebens.dev/alexlebens/helm-charts/src/branch/main/charts/cloudflared
   - https://gitea.alexlebens.dev/alexlebens/helm-charts/src/branch/main/charts/postgres-cluster
 maintainers:
@@ -45,14 +43,6 @@ dependencies:
   #   alias: mautrix-whatsapp
   #   repository: https://bjw-s-labs.github.io/helm-charts/
   #   version: 4.0.1
-  - name: valkey
-    alias: valkey-synapse
-    version: 3.0.22
-    repository: oci://harbor.alexlebens.net/proxy-registry-1.docker.io/bitnamicharts
-  - name: valkey
-    alias: valkey-hookshot
-    version: 3.0.22
-    repository: oci://harbor.alexlebens.net/proxy-registry-1.docker.io/bitnamicharts
   - name: cloudflared
     alias: cloudflared-synapse
     version: 1.18.0

clusters/cl01tl/platform/matrix-synapse/templates/external-secret.yaml

@@ -179,10 +179,10 @@ spec:
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: matrix-synapse-valkey-secret
+  name: matrix-synapse-redis-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: matrix-synapse-valkey-secret
+    app.kubernetes.io/name: matrix-synapse-redis-secret
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
@@ -194,7 +194,7 @@ spec:
       remoteRef:
         conversionStrategy: Default
         decodingStrategy: None
-        key: /cl01tl/matrix-synapse/valkey
+        key: /cl01tl/matrix-synapse/redis
         metadataPolicy: None
         property: password
 

clusters/cl01tl/platform/matrix-synapse/templates/redis-replication.yaml

@@ -0,0 +1,69 @@
+apiVersion: redis.redis.opstreelabs.in/v1beta2
+kind: RedisReplication
+metadata:
+  name: redis-replication-matrix-synapse
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: redis-replication-matrix-synapse
+    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
+    redisSecret:
+      name: matrix-synapse-redis-secret
+      key: password
+    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
+
+---
+apiVersion: redis.redis.opstreelabs.in/v1beta2
+kind: RedisReplication
+metadata:
+  name: redis-replication-hookshot
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: redis-replication-hookshot
+    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/platform/matrix-synapse/templates/service-monitor.yaml

@@ -38,3 +38,24 @@ spec:
       interval: 3m
       scrapeTimeout: 1m
       path: /metrics
+
+---
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: redis-replication-matrix-synapse
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: redis-replication-matrix-synapse
+    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/platform/matrix-synapse/values.yaml

@@ -102,9 +102,9 @@ matrix-synapse:
   redis:
     enabled: false
   externalRedis:
-    host: matrix-synapse-valkey-primary
+    host: redis-replication-matrix-synapse-master
     port: 6379
-    existingSecret: matrix-synapse-valkey-secret
+    existingSecret: matrix-synapse-redis-secret
     existingSecretPasswordKey: password
   persistence:
     enabled: true
@@ -288,53 +288,6 @@ mautrix-whatsapp:
               readOnly: true
               mountPropagation: None
               subPath: config.yaml
-valkey-synapse:
-  fullnameOverride: matrix-synapse-valkey
-  architecture: replication
-  auth:
-    enabled: true
-    existingSecret: matrix-synapse-valkey-secret
-    existingSecretPasswordKey: password
-  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
-valkey-hookshot:
-  fullnameOverride: matrix-hookshot-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
 cloudflared-synapse:
   name: cloudflared-synapse
   existingSecretName: matrix-synapse-cloudflared-synapse-secret

clusters/cl01tl/platform/n8n/Chart.yaml

@@ -8,11 +8,9 @@ keywords:
 home: https://wiki.alexlebens.dev/s/e4544bd4-c66a-420c-8020-c54b2078181a
 sources:
   - https://github.com/n8n-io/n8n
-  - https://github.com/valkey-io/valkey
   - https://github.com/cloudnative-pg/cloudnative-pg
   - https://github.com/n8n-io/n8n/pkgs/container/n8n
   - https://github.com/bjw-s-labs/helm-charts/tree/main/charts/other/app-template
-  - https://github.com/bitnami/charts/tree/main/bitnami/valkey
   - https://gitea.alexlebens.dev/alexlebens/helm-charts/src/branch/main/charts/postgres-cluster
 maintainers:
   - name: alexlebens
@@ -21,9 +19,6 @@ dependencies:
     alias: n8n
     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
   - name: postgres-cluster
     alias: postgres-17-cluster
     version: 5.1.0

clusters/cl01tl/platform/n8n/templates/redis-replication.yaml

@@ -0,0 +1,32 @@
+apiVersion: redis.redis.opstreelabs.in/v1beta2
+kind: RedisReplication
+metadata:
+  name: redis-replication-n8n
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: redis-replication-n8n
+    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/platform/n8n/templates/service-monitor.yaml

@@ -59,3 +59,24 @@ spec:
       interval: 3m
       scrapeTimeout: 1m
       path: /metrics
+
+---
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: redis-replication-n8n
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: redis-replication-n8n
+    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/platform/n8n/values.yaml

@@ -48,7 +48,7 @@ n8n:
             - name: EXECUTIONS_MODE
               value: queue
             - name: QUEUE_BULL_REDIS_HOST
-              value: n8n-valkey-primary.n8n
+              value: redis-replication-n8n-master.n8n
             - name: N8N_ENCRYPTION_KEY
               valueFrom:
                 secretKeyRef:
@@ -137,7 +137,7 @@ n8n:
             - name: EXECUTIONS_MODE
               value: queue
             - name: QUEUE_BULL_REDIS_HOST
-              value: n8n-valkey-primary.n8n
+              value: redis-replication-n8n-master.n8n
             - name: N8N_ENCRYPTION_KEY
               valueFrom:
                 secretKeyRef:
@@ -225,7 +225,7 @@ n8n:
             - name: EXECUTIONS_MODE
               value: queue
             - name: QUEUE_BULL_REDIS_HOST
-              value: n8n-valkey-primary.n8n
+              value: redis-replication-n8n-master.n8n
             - name: N8N_ENCRYPTION_KEY
               valueFrom:
                 secretKeyRef:
@@ -307,28 +307,6 @@ n8n:
           main:
             - path: /home/node/.n8n
               readOnly: false
-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
 postgres-17-cluster:
   mode: standalone
   cluster:

clusters/cl01tl/platform/stalwart/Chart.yaml

@@ -9,12 +9,10 @@ keywords:
 home: https://wiki.alexlebens.dev/s/e10d3a19-9329-4443-a023-6ab70ffaff6e
 sources:
   - https://github.com/stalwartlabs/mail-server
-  - https://github.com/valkey-io/valkey
   - https://github.com/elastic/elasticsearch
   - https://github.com/cloudnative-pg/cloudnative-pg
   - https://hub.docker.com/r/stalwartlabs/mail-server
   - https://github.com/bjw-s-labs/helm-charts/tree/main/charts/other/app-template
-  - https://github.com/bitnami/charts/tree/main/bitnami/valkey
   - https://gitea.alexlebens.dev/alexlebens/helm-charts/src/branch/main/charts/postgres-cluster
 maintainers:
   - name: alexlebens
@@ -23,9 +21,6 @@ dependencies:
     alias: stalwart
     version: 4.2.0
     repository: https://bjw-s-labs.github.io/helm-charts/
-  - name: valkey
-    version: 3.0.22
-    repository: oci://harbor.alexlebens.net/proxy-registry-1.docker.io/bitnamicharts
   - name: postgres-cluster
     alias: postgres-17-cluster
     version: 5.1.0

clusters/cl01tl/platform/stalwart/templates/redis-replication.yaml

@@ -0,0 +1,32 @@
+apiVersion: redis.redis.opstreelabs.in/v1beta2
+kind: RedisReplication
+metadata:
+  name: redis-replication-stalwart
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: redis-replication-stalwart
+    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/platform/stalwart/templates/service-monitor.yaml

@@ -0,0 +1,19 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: redis-replication-stalwart
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: redis-replication-stalwart
+    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/platform/stalwart/values.yaml

@@ -51,28 +51,6 @@ stalwart:
           main:
             - path: /opt/stalwart
               readOnly: false
-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
 postgres-17-cluster:
   mode: standalone
   cluster:

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

clusters/cl01tl/services/harbor/Chart.yaml

@@ -10,10 +10,8 @@ keywords:
 home: https://wiki.alexlebens.dev/s/7e132c13-afee-48ec-b3dd-efd656d240c9
 sources:
   - https://github.com/goharbor
-  - https://github.com/valkey-io/valkey
   - https://github.com/cloudnative-pg/cloudnative-pg
   - https://github.com/goharbor/harbor-helm
-  - https://github.com/bitnami/charts/tree/main/bitnami/valkey
   - https://gitea.alexlebens.dev/alexlebens/helm-charts/src/branch/main/charts/postgres-cluster
 maintainers:
   - name: alexlebens
@@ -21,9 +19,6 @@ dependencies:
   - name: harbor
     version: 1.17.1
     repository: https://helm.goharbor.io
-  - name: valkey
-    version: 3.0.22
-    repository: oci://harbor.alexlebens.net/proxy-registry-1.docker.io/bitnamicharts
   - name: postgres-cluster
     alias: postgres-17-cluster
     version: 5.1.0

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

@@ -0,0 +1,32 @@
+apiVersion: redis.redis.opstreelabs.in/v1beta2
+kind: RedisReplication
+metadata:
+  name: redis-replication-harbor
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: redis-replication-harbor
+    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/harbor/templates/service-monitor.yaml

@@ -0,0 +1,19 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: redis-replication-harbor
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: redis-replication-harbor
+    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/harbor/values.yaml

@@ -88,33 +88,12 @@ harbor:
   redis:
     type: external
     external:
-      addr: "harbor-valkey-primary.harbor:6379"
+      addr: "redis-replication-harbor-master.harbor:6379"
   exporter:
     image:
       repository: goharbor/harbor-exporter
       tag: v2.13.1
     replicas: 2
-valkey:
-  architecture: replication
-  auth:
-    enabled: false
-    usePasswordFiles: false
-  primary:
-    resources:
-      requests:
-        cpu: 100m
-        memory: 64Mi
-    persistence:
-      enabled: true
-      size: 5Gi
-  replica:
-    resources:
-      requests:
-        cpu: 100m
-        memory: 64Mi
-    persistence:
-      enabled: true
-      size: 5Gi
 postgres-17-cluster:
   mode: standalone
   cluster: