diff --git a/clusters/cl01tl/manifests/directus/RedisReplication-redis-replication-directus.yaml b/clusters/cl01tl/manifests/directus/RedisReplication-redis-replication-directus.yaml index 17ef8236c..823fc8d71 100644 --- a/clusters/cl01tl/manifests/directus/RedisReplication-redis-replication-directus.yaml +++ b/clusters/cl01tl/manifests/directus/RedisReplication-redis-replication-directus.yaml @@ -4,32 +4,36 @@ metadata: name: redis-replication-directus namespace: directus 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-directus app.kubernetes.io/instance: directus app.kubernetes.io/part-of: directus 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: 10m + memory: 32Mi redisSecret: name: directus-redis-config key: password - resources: - requests: - cpu: 50m - memory: 128Mi 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/directus/RedisSentinel-redis-sentinel-directus.yaml b/clusters/cl01tl/manifests/directus/RedisSentinel-redis-sentinel-directus.yaml index 6500abffa..9497edcfa 100644 --- a/clusters/cl01tl/manifests/directus/RedisSentinel-redis-sentinel-directus.yaml +++ b/clusters/cl01tl/manifests/directus/RedisSentinel-redis-sentinel-directus.yaml @@ -4,14 +4,17 @@ metadata: name: redis-sentinel-directus namespace: directus 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-directus app.kubernetes.io/instance: directus app.kubernetes.io/part-of: directus spec: clusterSize: 3 podSecurityContext: - runAsUser: 1000 fsGroup: 1000 + runAsUser: 1000 redisSentinelConfig: redisReplicationName: redis-replication-directus redisReplicationPassword: @@ -19,12 +22,15 @@ spec: name: directus-redis-config key: password kubernetesConfig: - image: quay.io/opstree/redis-sentinel:v8.4.0 + image: "quay.io/opstree/redis-sentinel:v8.4.0" imagePullPolicy: IfNotPresent - redisSecret: - name: directus-redis-config - key: password resources: requests: cpu: 10m - memory: 128Mi + memory: 32Mi + redisSecret: + name: directus-redis-config + key: password + redisExporter: + enabled: true + image: "quay.io/opstree/redis-exporter:v1.80.1" diff --git a/clusters/cl01tl/manifests/directus/ServiceMonitor-redis-replication-directus.yaml b/clusters/cl01tl/manifests/directus/ServiceMonitor-redis-replication-directus.yaml index a9a7c83db..175863ec0 100644 --- a/clusters/cl01tl/manifests/directus/ServiceMonitor-redis-replication-directus.yaml +++ b/clusters/cl01tl/manifests/directus/ServiceMonitor-redis-replication-directus.yaml @@ -4,15 +4,18 @@ metadata: name: redis-replication-directus namespace: directus 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-directus app.kubernetes.io/instance: directus app.kubernetes.io/part-of: directus - redis-operator: "true" - env: production spec: selector: matchLabels: + app: redis-replication-directus redis_setup_type: replication + role: replication endpoints: - port: redis-exporter interval: 30s diff --git a/clusters/cl01tl/manifests/directus/ServiceMonitor-redis-sentinel-directus.yaml b/clusters/cl01tl/manifests/directus/ServiceMonitor-redis-sentinel-directus.yaml new file mode 100644 index 000000000..e2169e47f --- /dev/null +++ b/clusters/cl01tl/manifests/directus/ServiceMonitor-redis-sentinel-directus.yaml @@ -0,0 +1,22 @@ +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: redis-sentinel-directus + namespace: directus + 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-directus + app.kubernetes.io/instance: directus + app.kubernetes.io/part-of: directus +spec: + selector: + matchLabels: + app: redis-sentinel-directus + redis_setup_type: sentinel + role: sentinel + endpoints: + - port: sentinel-client + interval: 30s + scrapeTimeout: 10s