From 7c7d39320eaeed158d2f582cd0454ca35b9079c4 Mon Sep 17 00:00:00 2001 From: gitea-bot Date: Mon, 15 Dec 2025 19:28:45 +0000 Subject: [PATCH 1/2] chore: Update manifests after change --- ...sReplication-redis-replication-postiz.yaml | 21 +++++++------- .../RedisSentinel-redis-sentinel-postiz.yaml | 29 +++++++++++++++++++ ...rviceMonitor-redis-replication-postiz.yaml | 7 +++-- .../ServiceMonitor-redis-sentinel-postiz.yaml | 22 ++++++++++++++ 4 files changed, 67 insertions(+), 12 deletions(-) create mode 100644 clusters/cl01tl/manifests/postiz/RedisSentinel-redis-sentinel-postiz.yaml create mode 100644 clusters/cl01tl/manifests/postiz/ServiceMonitor-redis-sentinel-postiz.yaml diff --git a/clusters/cl01tl/manifests/postiz/RedisReplication-redis-replication-postiz.yaml b/clusters/cl01tl/manifests/postiz/RedisReplication-redis-replication-postiz.yaml index 3cce0f853..8162e4a53 100644 --- a/clusters/cl01tl/manifests/postiz/RedisReplication-redis-replication-postiz.yaml +++ b/clusters/cl01tl/manifests/postiz/RedisReplication-redis-replication-postiz.yaml @@ -4,32 +4,33 @@ metadata: name: redis-replication-postiz namespace: postiz labels: + helm.sh/chart: redis-replication-0.5.0 + app.kubernetes.io/version: "0.5.0" + app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-postiz app.kubernetes.io/instance: postiz app.kubernetes.io/part-of: postiz spec: clusterSize: 3 podSecurityContext: - runAsUser: 1000 fsGroup: 1000 + runAsUser: 1000 kubernetesConfig: - image: quay.io/opstree/redis:v8.4.0 + image: "quay.io/opstree/redis:v8.4.0" imagePullPolicy: IfNotPresent - redisSecret: - name: postiz-redis-config - key: password resources: requests: - cpu: 50m - memory: 128Mi + cpu: 10m + memory: 32Mi storage: volumeClaimTemplate: spec: - storageClassName: ceph-block - accessModes: ["ReadWriteOnce"] + accessModes: + - ReadWriteOnce resources: requests: storage: 1Gi + storageClassName: ceph-block redisExporter: enabled: true - image: quay.io/opstree/redis-exporter:v1.80.1 + image: "quay.io/opstree/redis-exporter:v1.80.1" diff --git a/clusters/cl01tl/manifests/postiz/RedisSentinel-redis-sentinel-postiz.yaml b/clusters/cl01tl/manifests/postiz/RedisSentinel-redis-sentinel-postiz.yaml new file mode 100644 index 000000000..0feed4f84 --- /dev/null +++ b/clusters/cl01tl/manifests/postiz/RedisSentinel-redis-sentinel-postiz.yaml @@ -0,0 +1,29 @@ +apiVersion: redis.redis.opstreelabs.in/v1beta2 +kind: RedisSentinel +metadata: + name: redis-sentinel-postiz + namespace: postiz + labels: + helm.sh/chart: redis-replication-0.5.0 + app.kubernetes.io/version: "0.5.0" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: redis-sentinel-postiz + app.kubernetes.io/instance: postiz + app.kubernetes.io/part-of: postiz +spec: + clusterSize: 3 + podSecurityContext: + fsGroup: 1000 + runAsUser: 1000 + redisSentinelConfig: + redisReplicationName: redis-replication-postiz + kubernetesConfig: + image: "quay.io/opstree/redis-sentinel:v8.4.0" + imagePullPolicy: IfNotPresent + resources: + requests: + cpu: 10m + memory: 32Mi + redisExporter: + enabled: true + image: "quay.io/opstree/redis-exporter:v1.80.1" diff --git a/clusters/cl01tl/manifests/postiz/ServiceMonitor-redis-replication-postiz.yaml b/clusters/cl01tl/manifests/postiz/ServiceMonitor-redis-replication-postiz.yaml index cf7fbd52d..afd2f7e8a 100644 --- a/clusters/cl01tl/manifests/postiz/ServiceMonitor-redis-replication-postiz.yaml +++ b/clusters/cl01tl/manifests/postiz/ServiceMonitor-redis-replication-postiz.yaml @@ -4,15 +4,18 @@ metadata: name: redis-replication-postiz namespace: postiz labels: + helm.sh/chart: redis-replication-0.5.0 + app.kubernetes.io/version: "0.5.0" + app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-postiz app.kubernetes.io/instance: postiz app.kubernetes.io/part-of: postiz - redis-operator: "true" - env: production spec: selector: matchLabels: + app: redis-replication-postiz redis_setup_type: replication + role: replication endpoints: - port: redis-exporter interval: 30s diff --git a/clusters/cl01tl/manifests/postiz/ServiceMonitor-redis-sentinel-postiz.yaml b/clusters/cl01tl/manifests/postiz/ServiceMonitor-redis-sentinel-postiz.yaml new file mode 100644 index 000000000..95a39759e --- /dev/null +++ b/clusters/cl01tl/manifests/postiz/ServiceMonitor-redis-sentinel-postiz.yaml @@ -0,0 +1,22 @@ +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: redis-sentinel-postiz + namespace: postiz + labels: + helm.sh/chart: redis-replication-0.5.0 + app.kubernetes.io/version: "0.5.0" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: redis-sentinel-postiz + app.kubernetes.io/instance: postiz + app.kubernetes.io/part-of: postiz +spec: + selector: + matchLabels: + app: redis-sentinel-postiz + redis_setup_type: sentinel + role: sentinel + endpoints: + - port: sentinel-client + interval: 30s + scrapeTimeout: 10s -- 2.49.1 From 2908f278a1139a4330aa66a88127f63205fa1500 Mon Sep 17 00:00:00 2001 From: gitea-bot Date: Mon, 15 Dec 2025 19:31:25 +0000 Subject: [PATCH 2/2] chore: Update manifests after change --- ...sReplication-redis-replication-postiz.yaml | 3 +++ .../RedisSentinel-redis-sentinel-postiz.yaml | 7 ++++++ ...eplication-redis-replication-stalwart.yaml | 18 +++++++++------ ...RedisSentinel-redis-sentinel-stalwart.yaml | 12 +++++++--- ...iceMonitor-redis-replication-stalwart.yaml | 7 ++++-- ...erviceMonitor-redis-sentinel-stalwart.yaml | 22 +++++++++++++++++++ 6 files changed, 57 insertions(+), 12 deletions(-) create mode 100644 clusters/cl01tl/manifests/stalwart/ServiceMonitor-redis-sentinel-stalwart.yaml diff --git a/clusters/cl01tl/manifests/postiz/RedisReplication-redis-replication-postiz.yaml b/clusters/cl01tl/manifests/postiz/RedisReplication-redis-replication-postiz.yaml index 8162e4a53..2ff373db6 100644 --- a/clusters/cl01tl/manifests/postiz/RedisReplication-redis-replication-postiz.yaml +++ b/clusters/cl01tl/manifests/postiz/RedisReplication-redis-replication-postiz.yaml @@ -22,6 +22,9 @@ spec: requests: cpu: 10m memory: 32Mi + redisSecret: + name: postiz-redis-config + key: password storage: volumeClaimTemplate: spec: diff --git a/clusters/cl01tl/manifests/postiz/RedisSentinel-redis-sentinel-postiz.yaml b/clusters/cl01tl/manifests/postiz/RedisSentinel-redis-sentinel-postiz.yaml index 0feed4f84..d2fa2c97c 100644 --- a/clusters/cl01tl/manifests/postiz/RedisSentinel-redis-sentinel-postiz.yaml +++ b/clusters/cl01tl/manifests/postiz/RedisSentinel-redis-sentinel-postiz.yaml @@ -17,6 +17,10 @@ spec: runAsUser: 1000 redisSentinelConfig: redisReplicationName: redis-replication-postiz + redisReplicationPassword: + secretKeyRef: + name: postiz-redis-config + key: password kubernetesConfig: image: "quay.io/opstree/redis-sentinel:v8.4.0" imagePullPolicy: IfNotPresent @@ -24,6 +28,9 @@ spec: requests: cpu: 10m memory: 32Mi + redisSecret: + name: postiz-redis-config + key: password redisExporter: enabled: true image: "quay.io/opstree/redis-exporter:v1.80.1" diff --git a/clusters/cl01tl/manifests/stalwart/RedisReplication-redis-replication-stalwart.yaml b/clusters/cl01tl/manifests/stalwart/RedisReplication-redis-replication-stalwart.yaml index c6f25b085..ec027aab4 100644 --- a/clusters/cl01tl/manifests/stalwart/RedisReplication-redis-replication-stalwart.yaml +++ b/clusters/cl01tl/manifests/stalwart/RedisReplication-redis-replication-stalwart.yaml @@ -4,29 +4,33 @@ metadata: name: redis-replication-stalwart namespace: stalwart labels: + helm.sh/chart: redis-replication-0.5.0 + app.kubernetes.io/version: "0.5.0" + app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-stalwart app.kubernetes.io/instance: stalwart app.kubernetes.io/part-of: stalwart spec: clusterSize: 3 podSecurityContext: - runAsUser: 1000 fsGroup: 1000 + runAsUser: 1000 kubernetesConfig: - image: quay.io/opstree/redis:v8.4.0 + image: "quay.io/opstree/redis:v8.4.0" imagePullPolicy: IfNotPresent resources: requests: - cpu: 50m - memory: 128Mi + cpu: 10m + memory: 32Mi storage: volumeClaimTemplate: spec: - storageClassName: ceph-block - accessModes: ["ReadWriteOnce"] + accessModes: + - ReadWriteOnce resources: requests: storage: 1Gi + storageClassName: ceph-block redisExporter: enabled: true - image: quay.io/opstree/redis-exporter:v1.80.1 + image: "quay.io/opstree/redis-exporter:v1.80.1" diff --git a/clusters/cl01tl/manifests/stalwart/RedisSentinel-redis-sentinel-stalwart.yaml b/clusters/cl01tl/manifests/stalwart/RedisSentinel-redis-sentinel-stalwart.yaml index 0cbc99731..c3db9d436 100644 --- a/clusters/cl01tl/manifests/stalwart/RedisSentinel-redis-sentinel-stalwart.yaml +++ b/clusters/cl01tl/manifests/stalwart/RedisSentinel-redis-sentinel-stalwart.yaml @@ -4,20 +4,26 @@ metadata: name: redis-sentinel-stalwart namespace: stalwart labels: + helm.sh/chart: redis-replication-0.5.0 + app.kubernetes.io/version: "0.5.0" + app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-sentinel-stalwart app.kubernetes.io/instance: stalwart app.kubernetes.io/part-of: stalwart spec: clusterSize: 3 podSecurityContext: - runAsUser: 1000 fsGroup: 1000 + runAsUser: 1000 redisSentinelConfig: redisReplicationName: redis-replication-stalwart kubernetesConfig: - image: quay.io/opstree/redis-sentinel:v8.4.0 + image: "quay.io/opstree/redis-sentinel:v8.4.0" imagePullPolicy: IfNotPresent resources: requests: cpu: 10m - memory: 128Mi + memory: 32Mi + redisExporter: + enabled: true + image: "quay.io/opstree/redis-exporter:v1.80.1" diff --git a/clusters/cl01tl/manifests/stalwart/ServiceMonitor-redis-replication-stalwart.yaml b/clusters/cl01tl/manifests/stalwart/ServiceMonitor-redis-replication-stalwart.yaml index 66c5c45bb..c72852235 100644 --- a/clusters/cl01tl/manifests/stalwart/ServiceMonitor-redis-replication-stalwart.yaml +++ b/clusters/cl01tl/manifests/stalwart/ServiceMonitor-redis-replication-stalwart.yaml @@ -4,15 +4,18 @@ metadata: name: redis-replication-stalwart namespace: stalwart labels: + helm.sh/chart: redis-replication-0.5.0 + app.kubernetes.io/version: "0.5.0" + app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-stalwart app.kubernetes.io/instance: stalwart app.kubernetes.io/part-of: stalwart - redis-operator: "true" - env: production spec: selector: matchLabels: + app: redis-replication-stalwart redis_setup_type: replication + role: replication endpoints: - port: redis-exporter interval: 30s diff --git a/clusters/cl01tl/manifests/stalwart/ServiceMonitor-redis-sentinel-stalwart.yaml b/clusters/cl01tl/manifests/stalwart/ServiceMonitor-redis-sentinel-stalwart.yaml new file mode 100644 index 000000000..f57d06c05 --- /dev/null +++ b/clusters/cl01tl/manifests/stalwart/ServiceMonitor-redis-sentinel-stalwart.yaml @@ -0,0 +1,22 @@ +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: redis-sentinel-stalwart + namespace: stalwart + labels: + helm.sh/chart: redis-replication-0.5.0 + app.kubernetes.io/version: "0.5.0" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: redis-sentinel-stalwart + app.kubernetes.io/instance: stalwart + app.kubernetes.io/part-of: stalwart +spec: + selector: + matchLabels: + app: redis-sentinel-stalwart + redis_setup_type: sentinel + role: sentinel + endpoints: + - port: sentinel-client + interval: 30s + scrapeTimeout: 10s -- 2.49.1