From 481599f23040690dee8d11f7e85a0a71779ffc31 Mon Sep 17 00:00:00 2001 From: Alex Lebens Date: Mon, 15 Dec 2025 13:32:46 -0600 Subject: [PATCH] replace with chart --- clusters/cl01tl/helm/tubearchivist/Chart.lock | 7 ++-- clusters/cl01tl/helm/tubearchivist/Chart.yaml | 3 ++ .../templates/redis-replication.yaml | 32 ------------------- .../templates/redis-sentinel.yaml | 23 ------------- .../templates/service-monitor.yaml | 19 ----------- .../cl01tl/helm/tubearchivist/values.yaml | 13 ++++++++ 6 files changed, 21 insertions(+), 76 deletions(-) delete mode 100644 clusters/cl01tl/helm/tubearchivist/templates/redis-replication.yaml delete mode 100644 clusters/cl01tl/helm/tubearchivist/templates/redis-sentinel.yaml delete mode 100644 clusters/cl01tl/helm/tubearchivist/templates/service-monitor.yaml diff --git a/clusters/cl01tl/helm/tubearchivist/Chart.lock b/clusters/cl01tl/helm/tubearchivist/Chart.lock index a65460f5f..9a1fac65b 100644 --- a/clusters/cl01tl/helm/tubearchivist/Chart.lock +++ b/clusters/cl01tl/helm/tubearchivist/Chart.lock @@ -2,5 +2,8 @@ dependencies: - name: app-template repository: https://bjw-s-labs.github.io/helm-charts/ version: 4.5.0 -digest: sha256:90dcd99b696faeef6742f58e934ce7c836f3e61a614b916b2981ebf1f63cdf0e -generated: "2025-12-05T17:14:34.783048248Z" +- name: redis-replication + repository: oci://harbor.alexlebens.net/helm-charts + version: 0.5.0 +digest: sha256:363c75695819ac8e88366d1ae6d0389ccc8e0e991b7ab9fd400b6ee0f8ca9d73 +generated: "2025-12-15T13:32:13.330233-06:00" diff --git a/clusters/cl01tl/helm/tubearchivist/Chart.yaml b/clusters/cl01tl/helm/tubearchivist/Chart.yaml index 51224e8d8..13e34bc5e 100644 --- a/clusters/cl01tl/helm/tubearchivist/Chart.yaml +++ b/clusters/cl01tl/helm/tubearchivist/Chart.yaml @@ -20,5 +20,8 @@ dependencies: alias: tubearchivist repository: https://bjw-s-labs.github.io/helm-charts/ version: 4.5.0 + - name: redis-replication + version: 0.5.0 + repository: oci://harbor.alexlebens.net/helm-charts icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/tube-archivist.png appVersion: v0.5.8 diff --git a/clusters/cl01tl/helm/tubearchivist/templates/redis-replication.yaml b/clusters/cl01tl/helm/tubearchivist/templates/redis-replication.yaml deleted file mode 100644 index 5a57f3d42..000000000 --- a/clusters/cl01tl/helm/tubearchivist/templates/redis-replication.yaml +++ /dev/null @@ -1,32 +0,0 @@ -apiVersion: redis.redis.opstreelabs.in/v1beta2 -kind: RedisReplication -metadata: - name: redis-replication-tubearchivist - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: redis-replication-tubearchivist - 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 - resources: - requests: - cpu: 50m - memory: 128Mi - storage: - volumeClaimTemplate: - spec: - storageClassName: ceph-block - accessModes: ["ReadWriteOnce"] - resources: - requests: - storage: 10Gi - redisExporter: - enabled: true - image: quay.io/opstree/redis-exporter:v1.80.1 diff --git a/clusters/cl01tl/helm/tubearchivist/templates/redis-sentinel.yaml b/clusters/cl01tl/helm/tubearchivist/templates/redis-sentinel.yaml deleted file mode 100644 index 17f88c880..000000000 --- a/clusters/cl01tl/helm/tubearchivist/templates/redis-sentinel.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: redis.redis.opstreelabs.in/v1beta2 -kind: RedisSentinel -metadata: - name: redis-sentinel-tubearchivist - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: redis-sentinel-tubearchivist - 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-tubearchivist - kubernetesConfig: - image: quay.io/opstree/redis-sentinel:v8.4.0 - imagePullPolicy: IfNotPresent - resources: - requests: - cpu: 10m - memory: 128Mi diff --git a/clusters/cl01tl/helm/tubearchivist/templates/service-monitor.yaml b/clusters/cl01tl/helm/tubearchivist/templates/service-monitor.yaml deleted file mode 100644 index cf9e8bb5c..000000000 --- a/clusters/cl01tl/helm/tubearchivist/templates/service-monitor.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: redis-replication-tubearchivist - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: redis-replication-tubearchivist - 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/tubearchivist/values.yaml b/clusters/cl01tl/helm/tubearchivist/values.yaml index 793d5a7f0..e79cc27b0 100644 --- a/clusters/cl01tl/helm/tubearchivist/values.yaml +++ b/clusters/cl01tl/helm/tubearchivist/values.yaml @@ -105,3 +105,16 @@ tubearchivist: main: - path: /youtube readOnly: false +redis-replication: + existingSecret: + enabled: false + redisReplication: + clusterSize: 3 + volumeClaimTemplate: + spec: + resources: + requests: + storage: 10Gi + redisSentinel: + enabled: true + clusterSize: 3