From b49eed8db2393adeffe473b6623fccddc01a797f Mon Sep 17 00:00:00 2001 From: Alex Lebens Date: Mon, 15 Dec 2025 12:00:37 -0600 Subject: [PATCH] replace redis with chart --- clusters/cl01tl/helm/directus/Chart.lock | 7 ++-- clusters/cl01tl/helm/directus/Chart.yaml | 3 ++ .../directus/templates/redis-replication.yaml | 35 ------------------- .../directus/templates/redis-sentinel.yaml | 30 ---------------- .../directus/templates/service-monitor.yaml | 21 ----------- clusters/cl01tl/helm/directus/values.yaml | 10 ++++++ 6 files changed, 18 insertions(+), 88 deletions(-) delete mode 100644 clusters/cl01tl/helm/directus/templates/redis-replication.yaml delete mode 100644 clusters/cl01tl/helm/directus/templates/redis-sentinel.yaml diff --git a/clusters/cl01tl/helm/directus/Chart.lock b/clusters/cl01tl/helm/directus/Chart.lock index 392c8b997..4112c4f2e 100644 --- a/clusters/cl01tl/helm/directus/Chart.lock +++ b/clusters/cl01tl/helm/directus/Chart.lock @@ -8,5 +8,8 @@ dependencies: - name: postgres-cluster repository: oci://harbor.alexlebens.net/helm-charts version: 6.16.1 -digest: sha256:636b200b79efdd6ea36afdf29a5e85f3741b362dfcbf2af47c7aff9e55f02812 -generated: "2025-12-11T16:47:16.317535-06:00" +- name: redis-replication + repository: oci://harbor.alexlebens.net/helm-charts + version: 0.5.0 +digest: sha256:cdd1597dc32ee42c6d871e2f6f5aff3fc54abc2a9d0110403506e539ab0905f4 +generated: "2025-12-15T12:00:25.219454-06:00" diff --git a/clusters/cl01tl/helm/directus/Chart.yaml b/clusters/cl01tl/helm/directus/Chart.yaml index bffd95c9d..ff59749ac 100644 --- a/clusters/cl01tl/helm/directus/Chart.yaml +++ b/clusters/cl01tl/helm/directus/Chart.yaml @@ -29,5 +29,8 @@ dependencies: alias: postgres-18-cluster version: 6.16.1 repository: oci://harbor.alexlebens.net/helm-charts + - name: redis-replication + version: 0.5.0 + repository: oci://harbor.alexlebens.net/helm-charts icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/directus.png appVersion: 11.14.0 diff --git a/clusters/cl01tl/helm/directus/templates/redis-replication.yaml b/clusters/cl01tl/helm/directus/templates/redis-replication.yaml deleted file mode 100644 index 9549cb2c6..000000000 --- a/clusters/cl01tl/helm/directus/templates/redis-replication.yaml +++ /dev/null @@ -1,35 +0,0 @@ -apiVersion: redis.redis.opstreelabs.in/v1beta2 -kind: RedisReplication -metadata: - name: redis-replication-directus - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: redis-replication-directus - 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.4.0 - imagePullPolicy: IfNotPresent - redisSecret: - name: directus-redis-config - 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.80.1 diff --git a/clusters/cl01tl/helm/directus/templates/redis-sentinel.yaml b/clusters/cl01tl/helm/directus/templates/redis-sentinel.yaml deleted file mode 100644 index 260f5012a..000000000 --- a/clusters/cl01tl/helm/directus/templates/redis-sentinel.yaml +++ /dev/null @@ -1,30 +0,0 @@ -apiVersion: redis.redis.opstreelabs.in/v1beta2 -kind: RedisSentinel -metadata: - name: redis-sentinel-directus - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: redis-sentinel-directus - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/part-of: {{ .Release.Name }} -spec: - clusterSize: 3 - podSecurityContext: - runAsUser: 1000 - fsGroup: 1000 - redisSentinelConfig: - redisReplicationName: redis-replication-directus - redisReplicationPassword: - secretKeyRef: - name: directus-redis-config - key: password - kubernetesConfig: - image: quay.io/opstree/redis-sentinel:v8.4.0 - imagePullPolicy: IfNotPresent - redisSecret: - name: directus-redis-config - key: password - resources: - requests: - cpu: 10m - memory: 128Mi diff --git a/clusters/cl01tl/helm/directus/templates/service-monitor.yaml b/clusters/cl01tl/helm/directus/templates/service-monitor.yaml index 2e0768ec2..8d26b2857 100644 --- a/clusters/cl01tl/helm/directus/templates/service-monitor.yaml +++ b/clusters/cl01tl/helm/directus/templates/service-monitor.yaml @@ -20,24 +20,3 @@ spec: bearerTokenSecret: name: directus-metric-token key: metric-token - ---- -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: redis-replication-directus - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: redis-replication-directus - 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 diff --git a/clusters/cl01tl/helm/directus/values.yaml b/clusters/cl01tl/helm/directus/values.yaml index c44b98aa0..54503a7f3 100644 --- a/clusters/cl01tl/helm/directus/values.yaml +++ b/clusters/cl01tl/helm/directus/values.yaml @@ -217,3 +217,13 @@ postgres-18-cluster: # immediate: true # schedule: "0 0 4 * * SAT" # backupName: garage-remote +redis-replication: + existingSecret: + enabled: true + name: directus-redis-config + key: password + redisReplication: + clusterSize: 3 + redisSentinel: + enabled: true + clusterSize: 3