diff --git a/clusters/cl01tl/manifests/gitea/RedisReplication-redis-replication-gitea.yaml b/clusters/cl01tl/manifests/gitea/RedisReplication-redis-replication-gitea.yaml index c85b67d9f..0b2a6e398 100644 --- a/clusters/cl01tl/manifests/gitea/RedisReplication-redis-replication-gitea.yaml +++ b/clusters/cl01tl/manifests/gitea/RedisReplication-redis-replication-gitea.yaml @@ -20,8 +20,8 @@ spec: imagePullPolicy: IfNotPresent resources: requests: - cpu: 10m - memory: 32Mi + cpu: 20m + memory: 400Mi storage: volumeClaimTemplate: spec: diff --git a/clusters/cl01tl/manifests/tubearchivist/RedisReplication-redis-replication-tubearchivist.yaml b/clusters/cl01tl/manifests/tubearchivist/RedisReplication-redis-replication-tubearchivist.yaml index 6a72fb99d..63122b51d 100644 --- a/clusters/cl01tl/manifests/tubearchivist/RedisReplication-redis-replication-tubearchivist.yaml +++ b/clusters/cl01tl/manifests/tubearchivist/RedisReplication-redis-replication-tubearchivist.yaml @@ -20,8 +20,8 @@ spec: imagePullPolicy: IfNotPresent resources: requests: - cpu: 10m - memory: 32Mi + cpu: 200m + memory: 2400Mi storage: volumeClaimTemplate: spec: diff --git a/clusters/cl01tl/manifests/yamtrack/RedisReplication-redis-replication-yamtrack.yaml b/clusters/cl01tl/manifests/yamtrack/RedisReplication-redis-replication-yamtrack.yaml index 51a658e09..6146d89c7 100644 --- a/clusters/cl01tl/manifests/yamtrack/RedisReplication-redis-replication-yamtrack.yaml +++ b/clusters/cl01tl/manifests/yamtrack/RedisReplication-redis-replication-yamtrack.yaml @@ -4,29 +4,33 @@ metadata: name: redis-replication-yamtrack namespace: yamtrack 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-yamtrack app.kubernetes.io/instance: yamtrack app.kubernetes.io/part-of: yamtrack 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/yamtrack/RedisSentinel-redis-sentinel-yamtrack.yaml b/clusters/cl01tl/manifests/yamtrack/RedisSentinel-redis-sentinel-yamtrack.yaml index 794d175f1..fc4db5932 100644 --- a/clusters/cl01tl/manifests/yamtrack/RedisSentinel-redis-sentinel-yamtrack.yaml +++ b/clusters/cl01tl/manifests/yamtrack/RedisSentinel-redis-sentinel-yamtrack.yaml @@ -4,20 +4,26 @@ metadata: name: redis-sentinel-yamtrack namespace: yamtrack 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-yamtrack app.kubernetes.io/instance: yamtrack app.kubernetes.io/part-of: yamtrack spec: clusterSize: 3 podSecurityContext: - runAsUser: 1000 fsGroup: 1000 + runAsUser: 1000 redisSentinelConfig: redisReplicationName: redis-replication-yamtrack 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/yamtrack/ServiceMonitor-redis-replication-yamtrack.yaml b/clusters/cl01tl/manifests/yamtrack/ServiceMonitor-redis-replication-yamtrack.yaml index e7ce6c7ed..f1ed7726b 100644 --- a/clusters/cl01tl/manifests/yamtrack/ServiceMonitor-redis-replication-yamtrack.yaml +++ b/clusters/cl01tl/manifests/yamtrack/ServiceMonitor-redis-replication-yamtrack.yaml @@ -4,15 +4,18 @@ metadata: name: redis-replication-yamtrack namespace: yamtrack 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-yamtrack app.kubernetes.io/instance: yamtrack app.kubernetes.io/part-of: yamtrack - redis-operator: "true" - env: production spec: selector: matchLabels: + app: redis-replication-yamtrack redis_setup_type: replication + role: replication endpoints: - port: redis-exporter interval: 30s diff --git a/clusters/cl01tl/manifests/yamtrack/ServiceMonitor-redis-sentinel-yamtrack.yaml b/clusters/cl01tl/manifests/yamtrack/ServiceMonitor-redis-sentinel-yamtrack.yaml new file mode 100644 index 000000000..5486a19c5 --- /dev/null +++ b/clusters/cl01tl/manifests/yamtrack/ServiceMonitor-redis-sentinel-yamtrack.yaml @@ -0,0 +1,22 @@ +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: redis-sentinel-yamtrack + namespace: yamtrack + 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-yamtrack + app.kubernetes.io/instance: yamtrack + app.kubernetes.io/part-of: yamtrack +spec: + selector: + matchLabels: + app: redis-sentinel-yamtrack + redis_setup_type: sentinel + role: sentinel + endpoints: + - port: sentinel-client + interval: 30s + scrapeTimeout: 10s