From ee009ee9be0067fe03c4aefaf7f87f3208542c65 Mon Sep 17 00:00:00 2001 From: gitea-bot Date: Mon, 15 Dec 2025 18:07:34 +0000 Subject: [PATCH 1/3] chore: Update manifests after change --- ...isReplication-redis-replication-gitea.yaml | 22 +++++++------ ...eplication-redis-replication-renovate.yaml | 32 ------------------- .../RedisSentinel-redis-sentinel-gitea.yaml | 12 +++++-- ...erviceMonitor-redis-replication-gitea.yaml | 7 ++-- .../ServiceMonitor-redis-sentinel-gitea.yaml | 22 +++++++++++++ 5 files changed, 49 insertions(+), 46 deletions(-) delete mode 100644 clusters/cl01tl/manifests/gitea/RedisReplication-redis-replication-renovate.yaml create mode 100644 clusters/cl01tl/manifests/gitea/ServiceMonitor-redis-sentinel-gitea.yaml diff --git a/clusters/cl01tl/manifests/gitea/RedisReplication-redis-replication-gitea.yaml b/clusters/cl01tl/manifests/gitea/RedisReplication-redis-replication-gitea.yaml index 5d0ab109c..f4378ee0c 100644 --- a/clusters/cl01tl/manifests/gitea/RedisReplication-redis-replication-gitea.yaml +++ b/clusters/cl01tl/manifests/gitea/RedisReplication-redis-replication-gitea.yaml @@ -4,29 +4,33 @@ metadata: name: redis-replication-gitea namespace: gitea labels: + helm.sh/chart: redis-replication-renovate-0.5.0 + app.kubernetes.io/version: "0.5.0" + app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-gitea app.kubernetes.io/instance: gitea app.kubernetes.io/part-of: gitea spec: - clusterSize: 3 + clusterSize: 1 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: 10Gi + 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/gitea/RedisReplication-redis-replication-renovate.yaml b/clusters/cl01tl/manifests/gitea/RedisReplication-redis-replication-renovate.yaml deleted file mode 100644 index 9cf47c67e..000000000 --- a/clusters/cl01tl/manifests/gitea/RedisReplication-redis-replication-renovate.yaml +++ /dev/null @@ -1,32 +0,0 @@ -apiVersion: redis.redis.opstreelabs.in/v1beta2 -kind: RedisReplication -metadata: - name: redis-replication-renovate - namespace: gitea - labels: - app.kubernetes.io/name: redis-replication-renovate - app.kubernetes.io/instance: gitea - app.kubernetes.io/part-of: gitea -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: 1Gi - redisExporter: - enabled: true - image: quay.io/opstree/redis-exporter:v1.80.1 diff --git a/clusters/cl01tl/manifests/gitea/RedisSentinel-redis-sentinel-gitea.yaml b/clusters/cl01tl/manifests/gitea/RedisSentinel-redis-sentinel-gitea.yaml index 9e4a848d7..9b5e44ff3 100644 --- a/clusters/cl01tl/manifests/gitea/RedisSentinel-redis-sentinel-gitea.yaml +++ b/clusters/cl01tl/manifests/gitea/RedisSentinel-redis-sentinel-gitea.yaml @@ -4,20 +4,26 @@ metadata: name: redis-sentinel-gitea namespace: gitea labels: + helm.sh/chart: redis-replication-gitea-0.5.0 + app.kubernetes.io/version: "0.5.0" + app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-sentinel-gitea app.kubernetes.io/instance: gitea app.kubernetes.io/part-of: gitea spec: clusterSize: 3 podSecurityContext: - runAsUser: 1000 fsGroup: 1000 + runAsUser: 1000 redisSentinelConfig: redisReplicationName: redis-replication-gitea 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/gitea/ServiceMonitor-redis-replication-gitea.yaml b/clusters/cl01tl/manifests/gitea/ServiceMonitor-redis-replication-gitea.yaml index 0f089bb7d..5a8c50ef0 100644 --- a/clusters/cl01tl/manifests/gitea/ServiceMonitor-redis-replication-gitea.yaml +++ b/clusters/cl01tl/manifests/gitea/ServiceMonitor-redis-replication-gitea.yaml @@ -4,15 +4,18 @@ metadata: name: redis-replication-gitea namespace: gitea labels: + helm.sh/chart: redis-replication-renovate-0.5.0 + app.kubernetes.io/version: "0.5.0" + app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-gitea app.kubernetes.io/instance: gitea app.kubernetes.io/part-of: gitea - redis-operator: "true" - env: production spec: selector: matchLabels: + app: redis-replication-gitea redis_setup_type: replication + role: replication endpoints: - port: redis-exporter interval: 30s diff --git a/clusters/cl01tl/manifests/gitea/ServiceMonitor-redis-sentinel-gitea.yaml b/clusters/cl01tl/manifests/gitea/ServiceMonitor-redis-sentinel-gitea.yaml new file mode 100644 index 000000000..06d65be3d --- /dev/null +++ b/clusters/cl01tl/manifests/gitea/ServiceMonitor-redis-sentinel-gitea.yaml @@ -0,0 +1,22 @@ +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: redis-sentinel-gitea + namespace: gitea + labels: + helm.sh/chart: redis-replication-gitea-0.5.0 + app.kubernetes.io/version: "0.5.0" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: redis-sentinel-gitea + app.kubernetes.io/instance: gitea + app.kubernetes.io/part-of: gitea +spec: + selector: + matchLabels: + app: redis-sentinel-gitea + redis_setup_type: sentinel + role: sentinel + endpoints: + - port: sentinel-client + interval: 30s + scrapeTimeout: 10s -- 2.49.1 From dbec614c1ed486bdf947a0cae382d0dc35edf5b7 Mon Sep 17 00:00:00 2001 From: gitea-bot Date: Mon, 15 Dec 2025 18:11:19 +0000 Subject: [PATCH 2/3] chore: Update manifests after change --- ...isReplication-redis-replication-gitea.yaml | 6 ++-- ...eplication-redis-replication-renovate.yaml | 36 +++++++++++++++++++ ...edisSentinel-redis-replication-gitea.yaml} | 4 +-- ...erviceMonitor-redis-replication-gitea.yaml | 8 ++--- ...ceMonitor-redis-replication-renovate.yaml} | 14 ++++---- 5 files changed, 52 insertions(+), 16 deletions(-) create mode 100644 clusters/cl01tl/manifests/gitea/RedisReplication-redis-replication-renovate.yaml rename clusters/cl01tl/manifests/gitea/{RedisSentinel-redis-sentinel-gitea.yaml => RedisSentinel-redis-replication-gitea.yaml} (89%) rename clusters/cl01tl/manifests/gitea/{ServiceMonitor-redis-sentinel-gitea.yaml => ServiceMonitor-redis-replication-renovate.yaml} (56%) diff --git a/clusters/cl01tl/manifests/gitea/RedisReplication-redis-replication-gitea.yaml b/clusters/cl01tl/manifests/gitea/RedisReplication-redis-replication-gitea.yaml index f4378ee0c..c85b67d9f 100644 --- a/clusters/cl01tl/manifests/gitea/RedisReplication-redis-replication-gitea.yaml +++ b/clusters/cl01tl/manifests/gitea/RedisReplication-redis-replication-gitea.yaml @@ -4,14 +4,14 @@ metadata: name: redis-replication-gitea namespace: gitea labels: - helm.sh/chart: redis-replication-renovate-0.5.0 + helm.sh/chart: redis-replication-gitea-0.5.0 app.kubernetes.io/version: "0.5.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-gitea app.kubernetes.io/instance: gitea app.kubernetes.io/part-of: gitea spec: - clusterSize: 1 + clusterSize: 3 podSecurityContext: fsGroup: 1000 runAsUser: 1000 @@ -29,7 +29,7 @@ spec: - ReadWriteOnce resources: requests: - storage: 1Gi + storage: 10Gi storageClassName: ceph-block redisExporter: enabled: true diff --git a/clusters/cl01tl/manifests/gitea/RedisReplication-redis-replication-renovate.yaml b/clusters/cl01tl/manifests/gitea/RedisReplication-redis-replication-renovate.yaml new file mode 100644 index 000000000..768b0f818 --- /dev/null +++ b/clusters/cl01tl/manifests/gitea/RedisReplication-redis-replication-renovate.yaml @@ -0,0 +1,36 @@ +apiVersion: redis.redis.opstreelabs.in/v1beta2 +kind: RedisReplication +metadata: + name: redis-replication-renovate + namespace: gitea + labels: + helm.sh/chart: redis-replication-renovate-0.5.0 + app.kubernetes.io/version: "0.5.0" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: redis-replication-renovate + app.kubernetes.io/instance: gitea + app.kubernetes.io/part-of: gitea +spec: + clusterSize: 1 + podSecurityContext: + fsGroup: 1000 + runAsUser: 1000 + kubernetesConfig: + image: "quay.io/opstree/redis:v8.4.0" + imagePullPolicy: IfNotPresent + resources: + requests: + cpu: 10m + memory: 32Mi + storage: + volumeClaimTemplate: + spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 1Gi + storageClassName: ceph-block + redisExporter: + enabled: true + image: "quay.io/opstree/redis-exporter:v1.80.1" diff --git a/clusters/cl01tl/manifests/gitea/RedisSentinel-redis-sentinel-gitea.yaml b/clusters/cl01tl/manifests/gitea/RedisSentinel-redis-replication-gitea.yaml similarity index 89% rename from clusters/cl01tl/manifests/gitea/RedisSentinel-redis-sentinel-gitea.yaml rename to clusters/cl01tl/manifests/gitea/RedisSentinel-redis-replication-gitea.yaml index 9b5e44ff3..d830026c3 100644 --- a/clusters/cl01tl/manifests/gitea/RedisSentinel-redis-sentinel-gitea.yaml +++ b/clusters/cl01tl/manifests/gitea/RedisSentinel-redis-replication-gitea.yaml @@ -1,13 +1,13 @@ apiVersion: redis.redis.opstreelabs.in/v1beta2 kind: RedisSentinel metadata: - name: redis-sentinel-gitea + name: redis-replication-gitea namespace: gitea labels: helm.sh/chart: redis-replication-gitea-0.5.0 app.kubernetes.io/version: "0.5.0" app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: redis-sentinel-gitea + app.kubernetes.io/name: redis-replication-gitea app.kubernetes.io/instance: gitea app.kubernetes.io/part-of: gitea spec: diff --git a/clusters/cl01tl/manifests/gitea/ServiceMonitor-redis-replication-gitea.yaml b/clusters/cl01tl/manifests/gitea/ServiceMonitor-redis-replication-gitea.yaml index 5a8c50ef0..fa4a30659 100644 --- a/clusters/cl01tl/manifests/gitea/ServiceMonitor-redis-replication-gitea.yaml +++ b/clusters/cl01tl/manifests/gitea/ServiceMonitor-redis-replication-gitea.yaml @@ -4,7 +4,7 @@ metadata: name: redis-replication-gitea namespace: gitea labels: - helm.sh/chart: redis-replication-renovate-0.5.0 + helm.sh/chart: redis-replication-gitea-0.5.0 app.kubernetes.io/version: "0.5.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-gitea @@ -14,9 +14,9 @@ spec: selector: matchLabels: app: redis-replication-gitea - redis_setup_type: replication - role: replication + redis_setup_type: sentinel + role: sentinel endpoints: - - port: redis-exporter + - port: sentinel-client interval: 30s scrapeTimeout: 10s diff --git a/clusters/cl01tl/manifests/gitea/ServiceMonitor-redis-sentinel-gitea.yaml b/clusters/cl01tl/manifests/gitea/ServiceMonitor-redis-replication-renovate.yaml similarity index 56% rename from clusters/cl01tl/manifests/gitea/ServiceMonitor-redis-sentinel-gitea.yaml rename to clusters/cl01tl/manifests/gitea/ServiceMonitor-redis-replication-renovate.yaml index 06d65be3d..aabd36f52 100644 --- a/clusters/cl01tl/manifests/gitea/ServiceMonitor-redis-sentinel-gitea.yaml +++ b/clusters/cl01tl/manifests/gitea/ServiceMonitor-redis-replication-renovate.yaml @@ -1,22 +1,22 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: redis-sentinel-gitea + name: redis-replication-renovate namespace: gitea labels: - helm.sh/chart: redis-replication-gitea-0.5.0 + helm.sh/chart: redis-replication-renovate-0.5.0 app.kubernetes.io/version: "0.5.0" app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: redis-sentinel-gitea + app.kubernetes.io/name: redis-replication-renovate app.kubernetes.io/instance: gitea app.kubernetes.io/part-of: gitea spec: selector: matchLabels: - app: redis-sentinel-gitea - redis_setup_type: sentinel - role: sentinel + app: redis-replication-renovate + redis_setup_type: replication + role: replication endpoints: - - port: sentinel-client + - port: redis-exporter interval: 30s scrapeTimeout: 10s -- 2.49.1 From 3c0deddd85e8f8e037a301bc2e0da8df2e5b5752 Mon Sep 17 00:00:00 2001 From: gitea-bot Date: Mon, 15 Dec 2025 18:13:50 +0000 Subject: [PATCH 3/3] chore: Update manifests after change --- ...> RedisSentinel-redis-sentinel-gitea.yaml} | 4 ++-- ...erviceMonitor-redis-replication-gitea.yaml | 6 ++--- .../ServiceMonitor-redis-sentinel-gitea.yaml | 22 +++++++++++++++++++ 3 files changed, 27 insertions(+), 5 deletions(-) rename clusters/cl01tl/manifests/gitea/{RedisSentinel-redis-replication-gitea.yaml => RedisSentinel-redis-sentinel-gitea.yaml} (89%) create mode 100644 clusters/cl01tl/manifests/gitea/ServiceMonitor-redis-sentinel-gitea.yaml diff --git a/clusters/cl01tl/manifests/gitea/RedisSentinel-redis-replication-gitea.yaml b/clusters/cl01tl/manifests/gitea/RedisSentinel-redis-sentinel-gitea.yaml similarity index 89% rename from clusters/cl01tl/manifests/gitea/RedisSentinel-redis-replication-gitea.yaml rename to clusters/cl01tl/manifests/gitea/RedisSentinel-redis-sentinel-gitea.yaml index d830026c3..9b5e44ff3 100644 --- a/clusters/cl01tl/manifests/gitea/RedisSentinel-redis-replication-gitea.yaml +++ b/clusters/cl01tl/manifests/gitea/RedisSentinel-redis-sentinel-gitea.yaml @@ -1,13 +1,13 @@ apiVersion: redis.redis.opstreelabs.in/v1beta2 kind: RedisSentinel metadata: - name: redis-replication-gitea + name: redis-sentinel-gitea namespace: gitea labels: helm.sh/chart: redis-replication-gitea-0.5.0 app.kubernetes.io/version: "0.5.0" app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: redis-replication-gitea + app.kubernetes.io/name: redis-sentinel-gitea app.kubernetes.io/instance: gitea app.kubernetes.io/part-of: gitea spec: diff --git a/clusters/cl01tl/manifests/gitea/ServiceMonitor-redis-replication-gitea.yaml b/clusters/cl01tl/manifests/gitea/ServiceMonitor-redis-replication-gitea.yaml index fa4a30659..45753683b 100644 --- a/clusters/cl01tl/manifests/gitea/ServiceMonitor-redis-replication-gitea.yaml +++ b/clusters/cl01tl/manifests/gitea/ServiceMonitor-redis-replication-gitea.yaml @@ -14,9 +14,9 @@ spec: selector: matchLabels: app: redis-replication-gitea - redis_setup_type: sentinel - role: sentinel + redis_setup_type: replication + role: replication endpoints: - - port: sentinel-client + - port: redis-exporter interval: 30s scrapeTimeout: 10s diff --git a/clusters/cl01tl/manifests/gitea/ServiceMonitor-redis-sentinel-gitea.yaml b/clusters/cl01tl/manifests/gitea/ServiceMonitor-redis-sentinel-gitea.yaml new file mode 100644 index 000000000..06d65be3d --- /dev/null +++ b/clusters/cl01tl/manifests/gitea/ServiceMonitor-redis-sentinel-gitea.yaml @@ -0,0 +1,22 @@ +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: redis-sentinel-gitea + namespace: gitea + labels: + helm.sh/chart: redis-replication-gitea-0.5.0 + app.kubernetes.io/version: "0.5.0" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: redis-sentinel-gitea + app.kubernetes.io/instance: gitea + app.kubernetes.io/part-of: gitea +spec: + selector: + matchLabels: + app: redis-sentinel-gitea + redis_setup_type: sentinel + role: sentinel + endpoints: + - port: sentinel-client + interval: 30s + scrapeTimeout: 10s -- 2.49.1