From 742667c3b946bc265d11ed4d79e259821c1ed109 Mon Sep 17 00:00:00 2001 From: Alex Lebens Date: Mon, 15 Dec 2025 13:02:38 -0600 Subject: [PATCH] replace with chart --- .../helm/kube-prometheus-stack/Chart.lock | 7 ++-- .../helm/kube-prometheus-stack/Chart.yaml | 3 ++ .../templates/redis-replication.yaml | 32 ------------------- .../templates/service-monitor.yaml | 19 ----------- .../helm/kube-prometheus-stack/values.yaml | 8 +++++ 5 files changed, 16 insertions(+), 53 deletions(-) delete mode 100644 clusters/cl01tl/helm/kube-prometheus-stack/templates/redis-replication.yaml delete mode 100644 clusters/cl01tl/helm/kube-prometheus-stack/templates/service-monitor.yaml diff --git a/clusters/cl01tl/helm/kube-prometheus-stack/Chart.lock b/clusters/cl01tl/helm/kube-prometheus-stack/Chart.lock index 894b70810..cf9ad1a86 100644 --- a/clusters/cl01tl/helm/kube-prometheus-stack/Chart.lock +++ b/clusters/cl01tl/helm/kube-prometheus-stack/Chart.lock @@ -5,5 +5,8 @@ dependencies: - name: app-template repository: https://bjw-s-labs.github.io/helm-charts/ version: 4.5.0 -digest: sha256:78e60a6bd6407b1a2d0e1bb9f7717faedd7ad43ded9cb4b6a93e29e85bdf294a -generated: "2025-12-10T21:05:54.967633057Z" +- name: redis-replication + repository: oci://harbor.alexlebens.net/helm-charts + version: 0.5.0 +digest: sha256:ab60270fcaf467cda51a683d01978f805df2f08b3aa2ea490ef3374349a549a4 +generated: "2025-12-15T13:01:35.345305-06:00" diff --git a/clusters/cl01tl/helm/kube-prometheus-stack/Chart.yaml b/clusters/cl01tl/helm/kube-prometheus-stack/Chart.yaml index 93d77996d..b5ccec0ff 100644 --- a/clusters/cl01tl/helm/kube-prometheus-stack/Chart.yaml +++ b/clusters/cl01tl/helm/kube-prometheus-stack/Chart.yaml @@ -26,6 +26,9 @@ dependencies: alias: ntfy-alertmanager 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/prometheus.png # renovate: github=prometheus-operator/prometheus-operator appVersion: v0.87.1 diff --git a/clusters/cl01tl/helm/kube-prometheus-stack/templates/redis-replication.yaml b/clusters/cl01tl/helm/kube-prometheus-stack/templates/redis-replication.yaml deleted file mode 100644 index 1499e825b..000000000 --- a/clusters/cl01tl/helm/kube-prometheus-stack/templates/redis-replication.yaml +++ /dev/null @@ -1,32 +0,0 @@ -apiVersion: redis.redis.opstreelabs.in/v1beta2 -kind: RedisReplication -metadata: - name: redis-replication-kube-prometheus-stack - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: redis-replication-kube-prometheus-stack - 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 diff --git a/clusters/cl01tl/helm/kube-prometheus-stack/templates/service-monitor.yaml b/clusters/cl01tl/helm/kube-prometheus-stack/templates/service-monitor.yaml deleted file mode 100644 index b4715af05..000000000 --- a/clusters/cl01tl/helm/kube-prometheus-stack/templates/service-monitor.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: redis-replication-kube-prometheus-stack - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: redis-replication-kube-prometheus-stack - 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/kube-prometheus-stack/values.yaml b/clusters/cl01tl/helm/kube-prometheus-stack/values.yaml index 7be649aaa..c2c8e71f6 100644 --- a/clusters/cl01tl/helm/kube-prometheus-stack/values.yaml +++ b/clusters/cl01tl/helm/kube-prometheus-stack/values.yaml @@ -140,3 +140,11 @@ ntfy-alertmanager: readOnly: true mountPropagation: None subPath: config +redis-replication: + existingSecret: + enabled: false + redisReplication: + clusterSize: 3 + redisSentinel: + enabled: true + clusterSize: 3