diff --git a/clusters/cl01tl/manifests/authentik/RedisReplication-redis-replication-authentik.yaml b/clusters/cl01tl/manifests/authentik/RedisReplication-redis-replication-authentik.yaml index 3f0d92682..e22cc23f6 100644 --- a/clusters/cl01tl/manifests/authentik/RedisReplication-redis-replication-authentik.yaml +++ b/clusters/cl01tl/manifests/authentik/RedisReplication-redis-replication-authentik.yaml @@ -4,8 +4,8 @@ metadata: name: redis-replication-authentik namespace: authentik labels: - helm.sh/chart: redis-replication-0.5.0 - app.kubernetes.io/version: "0.5.0" + helm.sh/chart: redis-replication-1.0.1 + app.kubernetes.io/version: "1.0.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-authentik app.kubernetes.io/instance: authentik @@ -34,3 +34,11 @@ spec: redisExporter: enabled: true image: "quay.io/opstree/redis-exporter:v1.80.1" + sentinel: + image: "quay.io/opstree/redis-sentinel:v8.4.0" + imagePullPolicy: IfNotPresent + resources: + requests: + cpu: 10m + memory: 32Mi + size: 3 diff --git a/clusters/cl01tl/manifests/authentik/RedisSentinel-redis-sentinel-authentik.yaml b/clusters/cl01tl/manifests/authentik/RedisSentinel-redis-sentinel-authentik.yaml deleted file mode 100644 index ea097a7a9..000000000 --- a/clusters/cl01tl/manifests/authentik/RedisSentinel-redis-sentinel-authentik.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: redis.redis.opstreelabs.in/v1beta2 -kind: RedisSentinel -metadata: - name: redis-sentinel-authentik - namespace: authentik - 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-authentik - app.kubernetes.io/instance: authentik - app.kubernetes.io/part-of: authentik -spec: - clusterSize: 3 - podSecurityContext: - fsGroup: 1000 - runAsUser: 1000 - redisSentinelConfig: - redisReplicationName: redis-replication-authentik - 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/authentik/ServiceMonitor-redis-replication-authentik.yaml b/clusters/cl01tl/manifests/authentik/ServiceMonitor-redis-replication-authentik.yaml index 9ee0e8479..a20778539 100644 --- a/clusters/cl01tl/manifests/authentik/ServiceMonitor-redis-replication-authentik.yaml +++ b/clusters/cl01tl/manifests/authentik/ServiceMonitor-redis-replication-authentik.yaml @@ -4,8 +4,8 @@ metadata: name: redis-replication-authentik namespace: authentik labels: - helm.sh/chart: redis-replication-0.5.0 - app.kubernetes.io/version: "0.5.0" + helm.sh/chart: redis-replication-1.0.1 + app.kubernetes.io/version: "1.0.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-authentik app.kubernetes.io/instance: authentik diff --git a/clusters/cl01tl/manifests/authentik/ServiceMonitor-redis-sentinel-authentik.yaml b/clusters/cl01tl/manifests/authentik/ServiceMonitor-redis-sentinel-authentik.yaml deleted file mode 100644 index 5ff9ea504..000000000 --- a/clusters/cl01tl/manifests/authentik/ServiceMonitor-redis-sentinel-authentik.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: redis-sentinel-authentik - namespace: authentik - 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-authentik - app.kubernetes.io/instance: authentik - app.kubernetes.io/part-of: authentik -spec: - selector: - matchLabels: - app: redis-sentinel-authentik - redis_setup_type: sentinel - role: sentinel - endpoints: - - port: sentinel-client - interval: 30s - scrapeTimeout: 10s diff --git a/clusters/cl01tl/manifests/blocky/RedisReplication-redis-replication-blocky.yaml b/clusters/cl01tl/manifests/blocky/RedisReplication-redis-replication-blocky.yaml index 675ad1907..a5f9db4f4 100644 --- a/clusters/cl01tl/manifests/blocky/RedisReplication-redis-replication-blocky.yaml +++ b/clusters/cl01tl/manifests/blocky/RedisReplication-redis-replication-blocky.yaml @@ -34,11 +34,3 @@ spec: redisExporter: enabled: true image: "quay.io/opstree/redis-exporter:v1.80.1" - sentinel: - image: "quay.io/opstree/redis-sentinel:v8.4.0" - imagePullPolicy: IfNotPresent - resources: - requests: - cpu: 10m - memory: 32Mi - size: 3 diff --git a/clusters/cl01tl/manifests/directus/RedisReplication-redis-replication-directus.yaml b/clusters/cl01tl/manifests/directus/RedisReplication-redis-replication-directus.yaml index 823fc8d71..7621119b5 100644 --- a/clusters/cl01tl/manifests/directus/RedisReplication-redis-replication-directus.yaml +++ b/clusters/cl01tl/manifests/directus/RedisReplication-redis-replication-directus.yaml @@ -4,8 +4,8 @@ metadata: name: redis-replication-directus namespace: directus labels: - helm.sh/chart: redis-replication-0.5.0 - app.kubernetes.io/version: "0.5.0" + helm.sh/chart: redis-replication-1.0.1 + app.kubernetes.io/version: "1.0.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-directus app.kubernetes.io/instance: directus @@ -37,3 +37,14 @@ spec: redisExporter: enabled: true image: "quay.io/opstree/redis-exporter:v1.80.1" + sentinel: + image: "quay.io/opstree/redis-sentinel:v8.4.0" + imagePullPolicy: IfNotPresent + redisSecret: + name: directus-redis-config + key: password + resources: + requests: + cpu: 10m + memory: 32Mi + size: 3 diff --git a/clusters/cl01tl/manifests/directus/RedisSentinel-redis-sentinel-directus.yaml b/clusters/cl01tl/manifests/directus/RedisSentinel-redis-sentinel-directus.yaml deleted file mode 100644 index 9497edcfa..000000000 --- a/clusters/cl01tl/manifests/directus/RedisSentinel-redis-sentinel-directus.yaml +++ /dev/null @@ -1,36 +0,0 @@ -apiVersion: redis.redis.opstreelabs.in/v1beta2 -kind: RedisSentinel -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: - fsGroup: 1000 - runAsUser: 1000 - redisSentinelConfig: - redisReplicationName: redis-replication-directus - redisReplicationPassword: - secretKeyRef: - name: directus-redis-config - key: password - kubernetesConfig: - image: "quay.io/opstree/redis-sentinel:v8.4.0" - imagePullPolicy: IfNotPresent - resources: - requests: - cpu: 10m - 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 175863ec0..dc5b68ba7 100644 --- a/clusters/cl01tl/manifests/directus/ServiceMonitor-redis-replication-directus.yaml +++ b/clusters/cl01tl/manifests/directus/ServiceMonitor-redis-replication-directus.yaml @@ -4,8 +4,8 @@ metadata: name: redis-replication-directus namespace: directus labels: - helm.sh/chart: redis-replication-0.5.0 - app.kubernetes.io/version: "0.5.0" + helm.sh/chart: redis-replication-1.0.1 + app.kubernetes.io/version: "1.0.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-directus app.kubernetes.io/instance: directus diff --git a/clusters/cl01tl/manifests/directus/ServiceMonitor-redis-sentinel-directus.yaml b/clusters/cl01tl/manifests/directus/ServiceMonitor-redis-sentinel-directus.yaml deleted file mode 100644 index e2169e47f..000000000 --- a/clusters/cl01tl/manifests/directus/ServiceMonitor-redis-sentinel-directus.yaml +++ /dev/null @@ -1,22 +0,0 @@ -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 diff --git a/clusters/cl01tl/manifests/gitea/RedisReplication-redis-replication-gitea.yaml b/clusters/cl01tl/manifests/gitea/RedisReplication-redis-replication-gitea.yaml index 0b2a6e398..9389b4c62 100644 --- a/clusters/cl01tl/manifests/gitea/RedisReplication-redis-replication-gitea.yaml +++ b/clusters/cl01tl/manifests/gitea/RedisReplication-redis-replication-gitea.yaml @@ -4,8 +4,8 @@ metadata: name: redis-replication-gitea namespace: gitea labels: - helm.sh/chart: redis-replication-gitea-0.5.0 - app.kubernetes.io/version: "0.5.0" + helm.sh/chart: redis-replication-gitea-1.0.1 + app.kubernetes.io/version: "1.0.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-gitea app.kubernetes.io/instance: gitea @@ -34,3 +34,11 @@ spec: redisExporter: enabled: true image: "quay.io/opstree/redis-exporter:v1.80.1" + sentinel: + image: "quay.io/opstree/redis-sentinel:v8.4.0" + imagePullPolicy: IfNotPresent + resources: + requests: + cpu: 10m + memory: 32Mi + size: 3 diff --git a/clusters/cl01tl/manifests/gitea/RedisReplication-redis-replication-renovate.yaml b/clusters/cl01tl/manifests/gitea/RedisReplication-redis-replication-renovate.yaml index 768b0f818..e4b717e57 100644 --- a/clusters/cl01tl/manifests/gitea/RedisReplication-redis-replication-renovate.yaml +++ b/clusters/cl01tl/manifests/gitea/RedisReplication-redis-replication-renovate.yaml @@ -4,8 +4,8 @@ metadata: name: redis-replication-renovate namespace: gitea labels: - helm.sh/chart: redis-replication-renovate-0.5.0 - app.kubernetes.io/version: "0.5.0" + helm.sh/chart: redis-replication-renovate-1.0.1 + app.kubernetes.io/version: "1.0.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-renovate app.kubernetes.io/instance: gitea diff --git a/clusters/cl01tl/manifests/gitea/RedisSentinel-redis-sentinel-gitea.yaml b/clusters/cl01tl/manifests/gitea/RedisSentinel-redis-sentinel-gitea.yaml deleted file mode 100644 index 9b5e44ff3..000000000 --- a/clusters/cl01tl/manifests/gitea/RedisSentinel-redis-sentinel-gitea.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: redis.redis.opstreelabs.in/v1beta2 -kind: RedisSentinel -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: - fsGroup: 1000 - runAsUser: 1000 - redisSentinelConfig: - redisReplicationName: redis-replication-gitea - 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/gitea/ServiceMonitor-redis-replication-gitea.yaml b/clusters/cl01tl/manifests/gitea/ServiceMonitor-redis-replication-gitea.yaml index 45753683b..953971f2e 100644 --- a/clusters/cl01tl/manifests/gitea/ServiceMonitor-redis-replication-gitea.yaml +++ b/clusters/cl01tl/manifests/gitea/ServiceMonitor-redis-replication-gitea.yaml @@ -4,8 +4,8 @@ metadata: name: redis-replication-gitea namespace: gitea labels: - helm.sh/chart: redis-replication-gitea-0.5.0 - app.kubernetes.io/version: "0.5.0" + helm.sh/chart: redis-replication-gitea-1.0.1 + app.kubernetes.io/version: "1.0.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-gitea app.kubernetes.io/instance: gitea diff --git a/clusters/cl01tl/manifests/gitea/ServiceMonitor-redis-replication-renovate.yaml b/clusters/cl01tl/manifests/gitea/ServiceMonitor-redis-replication-renovate.yaml index aabd36f52..1fe1e0218 100644 --- a/clusters/cl01tl/manifests/gitea/ServiceMonitor-redis-replication-renovate.yaml +++ b/clusters/cl01tl/manifests/gitea/ServiceMonitor-redis-replication-renovate.yaml @@ -4,8 +4,8 @@ metadata: name: redis-replication-renovate namespace: gitea labels: - helm.sh/chart: redis-replication-renovate-0.5.0 - app.kubernetes.io/version: "0.5.0" + helm.sh/chart: redis-replication-renovate-1.0.1 + app.kubernetes.io/version: "1.0.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-renovate app.kubernetes.io/instance: gitea diff --git a/clusters/cl01tl/manifests/gitea/ServiceMonitor-redis-sentinel-gitea.yaml b/clusters/cl01tl/manifests/gitea/ServiceMonitor-redis-sentinel-gitea.yaml deleted file mode 100644 index 06d65be3d..000000000 --- a/clusters/cl01tl/manifests/gitea/ServiceMonitor-redis-sentinel-gitea.yaml +++ /dev/null @@ -1,22 +0,0 @@ -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 diff --git a/clusters/cl01tl/manifests/grafana-operator/RedisReplication-redis-replication-remote-cache.yaml b/clusters/cl01tl/manifests/grafana-operator/RedisReplication-redis-replication-remote-cache.yaml index 8e2ffee42..e62949f91 100644 --- a/clusters/cl01tl/manifests/grafana-operator/RedisReplication-redis-replication-remote-cache.yaml +++ b/clusters/cl01tl/manifests/grafana-operator/RedisReplication-redis-replication-remote-cache.yaml @@ -4,8 +4,8 @@ metadata: name: redis-replication-remote-cache namespace: grafana-operator labels: - helm.sh/chart: redis-replication-remote-cache-0.5.0 - app.kubernetes.io/version: "0.5.0" + helm.sh/chart: redis-replication-remote-cache-1.0.1 + app.kubernetes.io/version: "1.0.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-remote-cache app.kubernetes.io/instance: grafana-operator diff --git a/clusters/cl01tl/manifests/grafana-operator/RedisReplication-redis-replication-unified-alerting.yaml b/clusters/cl01tl/manifests/grafana-operator/RedisReplication-redis-replication-unified-alerting.yaml index 783a230f2..f18b84e33 100644 --- a/clusters/cl01tl/manifests/grafana-operator/RedisReplication-redis-replication-unified-alerting.yaml +++ b/clusters/cl01tl/manifests/grafana-operator/RedisReplication-redis-replication-unified-alerting.yaml @@ -4,8 +4,8 @@ metadata: name: redis-replication-unified-alerting namespace: grafana-operator labels: - helm.sh/chart: redis-replication-unified-alerting-0.5.0 - app.kubernetes.io/version: "0.5.0" + helm.sh/chart: redis-replication-unified-alerting-1.0.1 + app.kubernetes.io/version: "1.0.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-unified-alerting app.kubernetes.io/instance: grafana-operator @@ -34,3 +34,11 @@ spec: redisExporter: enabled: true image: "quay.io/opstree/redis-exporter:v1.80.1" + sentinel: + image: "quay.io/opstree/redis-sentinel:v8.4.0" + imagePullPolicy: IfNotPresent + resources: + requests: + cpu: 10m + memory: 32Mi + size: 3 diff --git a/clusters/cl01tl/manifests/grafana-operator/RedisSentinel-redis-sentinel-unified-alerting.yaml b/clusters/cl01tl/manifests/grafana-operator/RedisSentinel-redis-sentinel-unified-alerting.yaml deleted file mode 100644 index 43dae0c49..000000000 --- a/clusters/cl01tl/manifests/grafana-operator/RedisSentinel-redis-sentinel-unified-alerting.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: redis.redis.opstreelabs.in/v1beta2 -kind: RedisSentinel -metadata: - name: redis-sentinel-unified-alerting - namespace: grafana-operator - labels: - helm.sh/chart: redis-replication-unified-alerting-0.5.0 - app.kubernetes.io/version: "0.5.0" - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: redis-sentinel-unified-alerting - app.kubernetes.io/instance: grafana-operator - app.kubernetes.io/part-of: grafana-operator -spec: - clusterSize: 3 - podSecurityContext: - fsGroup: 1000 - runAsUser: 1000 - redisSentinelConfig: - redisReplicationName: redis-replication-unified-alerting - 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/grafana-operator/ServiceMonitor-redis-replication-remote-cache.yaml b/clusters/cl01tl/manifests/grafana-operator/ServiceMonitor-redis-replication-remote-cache.yaml index 34c22b84c..62cb3489a 100644 --- a/clusters/cl01tl/manifests/grafana-operator/ServiceMonitor-redis-replication-remote-cache.yaml +++ b/clusters/cl01tl/manifests/grafana-operator/ServiceMonitor-redis-replication-remote-cache.yaml @@ -4,8 +4,8 @@ metadata: name: redis-replication-remote-cache namespace: grafana-operator labels: - helm.sh/chart: redis-replication-remote-cache-0.5.0 - app.kubernetes.io/version: "0.5.0" + helm.sh/chart: redis-replication-remote-cache-1.0.1 + app.kubernetes.io/version: "1.0.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-remote-cache app.kubernetes.io/instance: grafana-operator diff --git a/clusters/cl01tl/manifests/grafana-operator/ServiceMonitor-redis-replication-unified-alerting.yaml b/clusters/cl01tl/manifests/grafana-operator/ServiceMonitor-redis-replication-unified-alerting.yaml index 88605e7a0..e115d682c 100644 --- a/clusters/cl01tl/manifests/grafana-operator/ServiceMonitor-redis-replication-unified-alerting.yaml +++ b/clusters/cl01tl/manifests/grafana-operator/ServiceMonitor-redis-replication-unified-alerting.yaml @@ -4,8 +4,8 @@ metadata: name: redis-replication-unified-alerting namespace: grafana-operator labels: - helm.sh/chart: redis-replication-unified-alerting-0.5.0 - app.kubernetes.io/version: "0.5.0" + helm.sh/chart: redis-replication-unified-alerting-1.0.1 + app.kubernetes.io/version: "1.0.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-unified-alerting app.kubernetes.io/instance: grafana-operator diff --git a/clusters/cl01tl/manifests/grafana-operator/ServiceMonitor-redis-sentinel-unified-alerting.yaml b/clusters/cl01tl/manifests/grafana-operator/ServiceMonitor-redis-sentinel-unified-alerting.yaml deleted file mode 100644 index ed2264c1a..000000000 --- a/clusters/cl01tl/manifests/grafana-operator/ServiceMonitor-redis-sentinel-unified-alerting.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: redis-sentinel-unified-alerting - namespace: grafana-operator - labels: - helm.sh/chart: redis-replication-unified-alerting-0.5.0 - app.kubernetes.io/version: "0.5.0" - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: redis-sentinel-unified-alerting - app.kubernetes.io/instance: grafana-operator - app.kubernetes.io/part-of: grafana-operator -spec: - selector: - matchLabels: - app: redis-sentinel-unified-alerting - redis_setup_type: sentinel - role: sentinel - endpoints: - - port: sentinel-client - interval: 30s - scrapeTimeout: 10s diff --git a/clusters/cl01tl/manifests/harbor/RedisReplication-redis-replication-harbor.yaml b/clusters/cl01tl/manifests/harbor/RedisReplication-redis-replication-harbor.yaml index 9901260f6..16ce0107f 100644 --- a/clusters/cl01tl/manifests/harbor/RedisReplication-redis-replication-harbor.yaml +++ b/clusters/cl01tl/manifests/harbor/RedisReplication-redis-replication-harbor.yaml @@ -4,8 +4,8 @@ metadata: name: redis-replication-harbor namespace: harbor labels: - helm.sh/chart: redis-replication-0.5.0 - app.kubernetes.io/version: "0.5.0" + helm.sh/chart: redis-replication-1.0.1 + app.kubernetes.io/version: "1.0.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-harbor app.kubernetes.io/instance: harbor @@ -34,3 +34,11 @@ spec: redisExporter: enabled: true image: "quay.io/opstree/redis-exporter:v1.80.1" + sentinel: + image: "quay.io/opstree/redis-sentinel:v8.4.0" + imagePullPolicy: IfNotPresent + resources: + requests: + cpu: 10m + memory: 32Mi + size: 3 diff --git a/clusters/cl01tl/manifests/harbor/RedisSentinel-redis-sentinel-harbor.yaml b/clusters/cl01tl/manifests/harbor/RedisSentinel-redis-sentinel-harbor.yaml deleted file mode 100644 index 357d0627f..000000000 --- a/clusters/cl01tl/manifests/harbor/RedisSentinel-redis-sentinel-harbor.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: redis.redis.opstreelabs.in/v1beta2 -kind: RedisSentinel -metadata: - name: redis-sentinel-harbor - namespace: harbor - 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-harbor - app.kubernetes.io/instance: harbor - app.kubernetes.io/part-of: harbor -spec: - clusterSize: 3 - podSecurityContext: - fsGroup: 1000 - runAsUser: 1000 - redisSentinelConfig: - redisReplicationName: redis-replication-harbor - 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/harbor/ServiceMonitor-redis-replication-harbor.yaml b/clusters/cl01tl/manifests/harbor/ServiceMonitor-redis-replication-harbor.yaml index e7b984602..1e504dcb4 100644 --- a/clusters/cl01tl/manifests/harbor/ServiceMonitor-redis-replication-harbor.yaml +++ b/clusters/cl01tl/manifests/harbor/ServiceMonitor-redis-replication-harbor.yaml @@ -4,8 +4,8 @@ metadata: name: redis-replication-harbor namespace: harbor labels: - helm.sh/chart: redis-replication-0.5.0 - app.kubernetes.io/version: "0.5.0" + helm.sh/chart: redis-replication-1.0.1 + app.kubernetes.io/version: "1.0.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-harbor app.kubernetes.io/instance: harbor diff --git a/clusters/cl01tl/manifests/harbor/ServiceMonitor-redis-sentinel-harbor.yaml b/clusters/cl01tl/manifests/harbor/ServiceMonitor-redis-sentinel-harbor.yaml deleted file mode 100644 index e16bcb64d..000000000 --- a/clusters/cl01tl/manifests/harbor/ServiceMonitor-redis-sentinel-harbor.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: redis-sentinel-harbor - namespace: harbor - 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-harbor - app.kubernetes.io/instance: harbor - app.kubernetes.io/part-of: harbor -spec: - selector: - matchLabels: - app: redis-sentinel-harbor - redis_setup_type: sentinel - role: sentinel - endpoints: - - port: sentinel-client - interval: 30s - scrapeTimeout: 10s diff --git a/clusters/cl01tl/manifests/immich/RedisReplication-redis-replication-immich.yaml b/clusters/cl01tl/manifests/immich/RedisReplication-redis-replication-immich.yaml index 659077d00..90e158904 100644 --- a/clusters/cl01tl/manifests/immich/RedisReplication-redis-replication-immich.yaml +++ b/clusters/cl01tl/manifests/immich/RedisReplication-redis-replication-immich.yaml @@ -4,8 +4,8 @@ metadata: name: redis-replication-immich namespace: immich labels: - helm.sh/chart: redis-replication-0.5.0 - app.kubernetes.io/version: "0.5.0" + helm.sh/chart: redis-replication-1.0.1 + app.kubernetes.io/version: "1.0.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-immich app.kubernetes.io/instance: immich @@ -34,3 +34,11 @@ spec: redisExporter: enabled: true image: "quay.io/opstree/redis-exporter:v1.80.1" + sentinel: + image: "quay.io/opstree/redis-sentinel:v8.4.0" + imagePullPolicy: IfNotPresent + resources: + requests: + cpu: 10m + memory: 32Mi + size: 3 diff --git a/clusters/cl01tl/manifests/immich/RedisSentinel-redis-sentinel-immich.yaml b/clusters/cl01tl/manifests/immich/RedisSentinel-redis-sentinel-immich.yaml deleted file mode 100644 index 2c3aab787..000000000 --- a/clusters/cl01tl/manifests/immich/RedisSentinel-redis-sentinel-immich.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: redis.redis.opstreelabs.in/v1beta2 -kind: RedisSentinel -metadata: - name: redis-sentinel-immich - namespace: immich - 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-immich - app.kubernetes.io/instance: immich - app.kubernetes.io/part-of: immich -spec: - clusterSize: 3 - podSecurityContext: - fsGroup: 1000 - runAsUser: 1000 - redisSentinelConfig: - redisReplicationName: redis-replication-immich - 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/immich/ServiceMonitor-redis-replication-immich.yaml b/clusters/cl01tl/manifests/immich/ServiceMonitor-redis-replication-immich.yaml index 1ca05e39f..e923b8ce8 100644 --- a/clusters/cl01tl/manifests/immich/ServiceMonitor-redis-replication-immich.yaml +++ b/clusters/cl01tl/manifests/immich/ServiceMonitor-redis-replication-immich.yaml @@ -4,8 +4,8 @@ metadata: name: redis-replication-immich namespace: immich labels: - helm.sh/chart: redis-replication-0.5.0 - app.kubernetes.io/version: "0.5.0" + helm.sh/chart: redis-replication-1.0.1 + app.kubernetes.io/version: "1.0.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-immich app.kubernetes.io/instance: immich diff --git a/clusters/cl01tl/manifests/immich/ServiceMonitor-redis-sentinel-immich.yaml b/clusters/cl01tl/manifests/immich/ServiceMonitor-redis-sentinel-immich.yaml deleted file mode 100644 index 0f18a0958..000000000 --- a/clusters/cl01tl/manifests/immich/ServiceMonitor-redis-sentinel-immich.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: redis-sentinel-immich - namespace: immich - 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-immich - app.kubernetes.io/instance: immich - app.kubernetes.io/part-of: immich -spec: - selector: - matchLabels: - app: redis-sentinel-immich - redis_setup_type: sentinel - role: sentinel - endpoints: - - port: sentinel-client - interval: 30s - scrapeTimeout: 10s diff --git a/clusters/cl01tl/manifests/kube-prometheus-stack/RedisReplication-redis-replication-kube-prometheus-stack.yaml b/clusters/cl01tl/manifests/kube-prometheus-stack/RedisReplication-redis-replication-kube-prometheus-stack.yaml index 0a92f3c92..740b93445 100644 --- a/clusters/cl01tl/manifests/kube-prometheus-stack/RedisReplication-redis-replication-kube-prometheus-stack.yaml +++ b/clusters/cl01tl/manifests/kube-prometheus-stack/RedisReplication-redis-replication-kube-prometheus-stack.yaml @@ -4,8 +4,8 @@ metadata: name: redis-replication-kube-prometheus-stack namespace: kube-prometheus-stack labels: - helm.sh/chart: redis-replication-0.5.0 - app.kubernetes.io/version: "0.5.0" + helm.sh/chart: redis-replication-1.0.1 + app.kubernetes.io/version: "1.0.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-kube-prometheus-stack app.kubernetes.io/instance: kube-prometheus-stack @@ -34,3 +34,11 @@ spec: redisExporter: enabled: true image: "quay.io/opstree/redis-exporter:v1.80.1" + sentinel: + image: "quay.io/opstree/redis-sentinel:v8.4.0" + imagePullPolicy: IfNotPresent + resources: + requests: + cpu: 10m + memory: 32Mi + size: 3 diff --git a/clusters/cl01tl/manifests/kube-prometheus-stack/RedisSentinel-redis-sentinel-kube-prometheus-stack.yaml b/clusters/cl01tl/manifests/kube-prometheus-stack/RedisSentinel-redis-sentinel-kube-prometheus-stack.yaml deleted file mode 100644 index 18aa21b4d..000000000 --- a/clusters/cl01tl/manifests/kube-prometheus-stack/RedisSentinel-redis-sentinel-kube-prometheus-stack.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: redis.redis.opstreelabs.in/v1beta2 -kind: RedisSentinel -metadata: - name: redis-sentinel-kube-prometheus-stack - namespace: kube-prometheus-stack - 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-kube-prometheus-stack - app.kubernetes.io/instance: kube-prometheus-stack - app.kubernetes.io/part-of: kube-prometheus-stack -spec: - clusterSize: 3 - podSecurityContext: - fsGroup: 1000 - runAsUser: 1000 - redisSentinelConfig: - redisReplicationName: redis-replication-kube-prometheus-stack - 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/kube-prometheus-stack/ServiceMonitor-redis-replication-kube-prometheus-stack.yaml b/clusters/cl01tl/manifests/kube-prometheus-stack/ServiceMonitor-redis-replication-kube-prometheus-stack.yaml index d278a2381..268161d4a 100644 --- a/clusters/cl01tl/manifests/kube-prometheus-stack/ServiceMonitor-redis-replication-kube-prometheus-stack.yaml +++ b/clusters/cl01tl/manifests/kube-prometheus-stack/ServiceMonitor-redis-replication-kube-prometheus-stack.yaml @@ -4,8 +4,8 @@ metadata: name: redis-replication-kube-prometheus-stack namespace: kube-prometheus-stack labels: - helm.sh/chart: redis-replication-0.5.0 - app.kubernetes.io/version: "0.5.0" + helm.sh/chart: redis-replication-1.0.1 + app.kubernetes.io/version: "1.0.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-kube-prometheus-stack app.kubernetes.io/instance: kube-prometheus-stack diff --git a/clusters/cl01tl/manifests/kube-prometheus-stack/ServiceMonitor-redis-sentinel-kube-prometheus-stack.yaml b/clusters/cl01tl/manifests/kube-prometheus-stack/ServiceMonitor-redis-sentinel-kube-prometheus-stack.yaml deleted file mode 100644 index fa4ab7008..000000000 --- a/clusters/cl01tl/manifests/kube-prometheus-stack/ServiceMonitor-redis-sentinel-kube-prometheus-stack.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: redis-sentinel-kube-prometheus-stack - namespace: kube-prometheus-stack - 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-kube-prometheus-stack - app.kubernetes.io/instance: kube-prometheus-stack - app.kubernetes.io/part-of: kube-prometheus-stack -spec: - selector: - matchLabels: - app: redis-sentinel-kube-prometheus-stack - redis_setup_type: sentinel - role: sentinel - endpoints: - - port: sentinel-client - interval: 30s - scrapeTimeout: 10s diff --git a/clusters/cl01tl/manifests/matrix-synapse/RedisReplication-redis-replication-hookshot.yaml b/clusters/cl01tl/manifests/matrix-synapse/RedisReplication-redis-replication-hookshot.yaml index 64c1418eb..ec0b4aafe 100644 --- a/clusters/cl01tl/manifests/matrix-synapse/RedisReplication-redis-replication-hookshot.yaml +++ b/clusters/cl01tl/manifests/matrix-synapse/RedisReplication-redis-replication-hookshot.yaml @@ -4,8 +4,8 @@ metadata: name: redis-replication-hookshot namespace: matrix-synapse labels: - helm.sh/chart: redis-replication-hookshot-0.5.0 - app.kubernetes.io/version: "0.5.0" + helm.sh/chart: redis-replication-hookshot-1.0.1 + app.kubernetes.io/version: "1.0.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-hookshot app.kubernetes.io/instance: matrix-synapse @@ -34,3 +34,11 @@ spec: redisExporter: enabled: true image: "quay.io/opstree/redis-exporter:v1.80.1" + sentinel: + image: "quay.io/opstree/redis-sentinel:v8.4.0" + imagePullPolicy: IfNotPresent + resources: + requests: + cpu: 10m + memory: 32Mi + size: 3 diff --git a/clusters/cl01tl/manifests/matrix-synapse/RedisReplication-redis-replication-matrix-synapse.yaml b/clusters/cl01tl/manifests/matrix-synapse/RedisReplication-redis-replication-matrix-synapse.yaml index 41cade9b9..96c5ce730 100644 --- a/clusters/cl01tl/manifests/matrix-synapse/RedisReplication-redis-replication-matrix-synapse.yaml +++ b/clusters/cl01tl/manifests/matrix-synapse/RedisReplication-redis-replication-matrix-synapse.yaml @@ -4,8 +4,8 @@ metadata: name: redis-replication-matrix-synapse namespace: matrix-synapse labels: - helm.sh/chart: redis-replication-matrix-synapse-0.5.0 - app.kubernetes.io/version: "0.5.0" + helm.sh/chart: redis-replication-matrix-synapse-1.0.1 + app.kubernetes.io/version: "1.0.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-matrix-synapse app.kubernetes.io/instance: matrix-synapse @@ -37,3 +37,14 @@ spec: redisExporter: enabled: true image: "quay.io/opstree/redis-exporter:v1.80.1" + sentinel: + image: "quay.io/opstree/redis-sentinel:v8.4.0" + imagePullPolicy: IfNotPresent + redisSecret: + name: matrix-synapse-redis-secret + key: password + resources: + requests: + cpu: 10m + memory: 32Mi + size: 3 diff --git a/clusters/cl01tl/manifests/matrix-synapse/RedisSentinel-redis-sentinel-hookshot.yaml b/clusters/cl01tl/manifests/matrix-synapse/RedisSentinel-redis-sentinel-hookshot.yaml deleted file mode 100644 index c0caa86c7..000000000 --- a/clusters/cl01tl/manifests/matrix-synapse/RedisSentinel-redis-sentinel-hookshot.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: redis.redis.opstreelabs.in/v1beta2 -kind: RedisSentinel -metadata: - name: redis-sentinel-hookshot - namespace: matrix-synapse - labels: - helm.sh/chart: redis-replication-hookshot-0.5.0 - app.kubernetes.io/version: "0.5.0" - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: redis-sentinel-hookshot - app.kubernetes.io/instance: matrix-synapse - app.kubernetes.io/part-of: matrix-synapse -spec: - clusterSize: 3 - podSecurityContext: - fsGroup: 1000 - runAsUser: 1000 - redisSentinelConfig: - redisReplicationName: redis-replication-hookshot - 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/matrix-synapse/RedisSentinel-redis-sentinel-matrix-synapse.yaml b/clusters/cl01tl/manifests/matrix-synapse/RedisSentinel-redis-sentinel-matrix-synapse.yaml deleted file mode 100644 index 8aa5b9b46..000000000 --- a/clusters/cl01tl/manifests/matrix-synapse/RedisSentinel-redis-sentinel-matrix-synapse.yaml +++ /dev/null @@ -1,36 +0,0 @@ -apiVersion: redis.redis.opstreelabs.in/v1beta2 -kind: RedisSentinel -metadata: - name: redis-sentinel-matrix-synapse - namespace: matrix-synapse - labels: - helm.sh/chart: redis-replication-matrix-synapse-0.5.0 - app.kubernetes.io/version: "0.5.0" - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: redis-sentinel-matrix-synapse - app.kubernetes.io/instance: matrix-synapse - app.kubernetes.io/part-of: matrix-synapse -spec: - clusterSize: 3 - podSecurityContext: - fsGroup: 1000 - runAsUser: 1000 - redisSentinelConfig: - redisReplicationName: redis-replication-matrix-synapse - redisReplicationPassword: - secretKeyRef: - name: matrix-synapse-redis-secret - key: password - kubernetesConfig: - image: "quay.io/opstree/redis-sentinel:v8.4.0" - imagePullPolicy: IfNotPresent - resources: - requests: - cpu: 10m - memory: 32Mi - redisSecret: - name: matrix-synapse-redis-secret - key: password - redisExporter: - enabled: true - image: "quay.io/opstree/redis-exporter:v1.80.1" diff --git a/clusters/cl01tl/manifests/matrix-synapse/ServiceMonitor-redis-replication-hookshot.yaml b/clusters/cl01tl/manifests/matrix-synapse/ServiceMonitor-redis-replication-hookshot.yaml index 71d87a9ed..e2abf34a6 100644 --- a/clusters/cl01tl/manifests/matrix-synapse/ServiceMonitor-redis-replication-hookshot.yaml +++ b/clusters/cl01tl/manifests/matrix-synapse/ServiceMonitor-redis-replication-hookshot.yaml @@ -4,8 +4,8 @@ metadata: name: redis-replication-hookshot namespace: matrix-synapse labels: - helm.sh/chart: redis-replication-hookshot-0.5.0 - app.kubernetes.io/version: "0.5.0" + helm.sh/chart: redis-replication-hookshot-1.0.1 + app.kubernetes.io/version: "1.0.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-hookshot app.kubernetes.io/instance: matrix-synapse diff --git a/clusters/cl01tl/manifests/matrix-synapse/ServiceMonitor-redis-replication-matrix-synapse.yaml b/clusters/cl01tl/manifests/matrix-synapse/ServiceMonitor-redis-replication-matrix-synapse.yaml index 3bc53f6fd..95cc7461e 100644 --- a/clusters/cl01tl/manifests/matrix-synapse/ServiceMonitor-redis-replication-matrix-synapse.yaml +++ b/clusters/cl01tl/manifests/matrix-synapse/ServiceMonitor-redis-replication-matrix-synapse.yaml @@ -4,8 +4,8 @@ metadata: name: redis-replication-matrix-synapse namespace: matrix-synapse labels: - helm.sh/chart: redis-replication-matrix-synapse-0.5.0 - app.kubernetes.io/version: "0.5.0" + helm.sh/chart: redis-replication-matrix-synapse-1.0.1 + app.kubernetes.io/version: "1.0.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-matrix-synapse app.kubernetes.io/instance: matrix-synapse diff --git a/clusters/cl01tl/manifests/matrix-synapse/ServiceMonitor-redis-sentinel-hookshot.yaml b/clusters/cl01tl/manifests/matrix-synapse/ServiceMonitor-redis-sentinel-hookshot.yaml deleted file mode 100644 index 4b0a375ff..000000000 --- a/clusters/cl01tl/manifests/matrix-synapse/ServiceMonitor-redis-sentinel-hookshot.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: redis-sentinel-hookshot - namespace: matrix-synapse - labels: - helm.sh/chart: redis-replication-hookshot-0.5.0 - app.kubernetes.io/version: "0.5.0" - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: redis-sentinel-hookshot - app.kubernetes.io/instance: matrix-synapse - app.kubernetes.io/part-of: matrix-synapse -spec: - selector: - matchLabels: - app: redis-sentinel-hookshot - redis_setup_type: sentinel - role: sentinel - endpoints: - - port: sentinel-client - interval: 30s - scrapeTimeout: 10s diff --git a/clusters/cl01tl/manifests/matrix-synapse/ServiceMonitor-redis-sentinel-matrix-synapse.yaml b/clusters/cl01tl/manifests/matrix-synapse/ServiceMonitor-redis-sentinel-matrix-synapse.yaml deleted file mode 100644 index e7297eea6..000000000 --- a/clusters/cl01tl/manifests/matrix-synapse/ServiceMonitor-redis-sentinel-matrix-synapse.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: redis-sentinel-matrix-synapse - namespace: matrix-synapse - labels: - helm.sh/chart: redis-replication-matrix-synapse-0.5.0 - app.kubernetes.io/version: "0.5.0" - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: redis-sentinel-matrix-synapse - app.kubernetes.io/instance: matrix-synapse - app.kubernetes.io/part-of: matrix-synapse -spec: - selector: - matchLabels: - app: redis-sentinel-matrix-synapse - redis_setup_type: sentinel - role: sentinel - endpoints: - - port: sentinel-client - interval: 30s - scrapeTimeout: 10s diff --git a/clusters/cl01tl/manifests/outline/RedisReplication-redis-replication-outline.yaml b/clusters/cl01tl/manifests/outline/RedisReplication-redis-replication-outline.yaml index e76e90ac6..165a7174e 100644 --- a/clusters/cl01tl/manifests/outline/RedisReplication-redis-replication-outline.yaml +++ b/clusters/cl01tl/manifests/outline/RedisReplication-redis-replication-outline.yaml @@ -4,8 +4,8 @@ metadata: name: redis-replication-outline namespace: outline labels: - helm.sh/chart: redis-replication-0.5.0 - app.kubernetes.io/version: "0.5.0" + helm.sh/chart: redis-replication-1.0.1 + app.kubernetes.io/version: "1.0.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-outline app.kubernetes.io/instance: outline @@ -34,3 +34,11 @@ spec: redisExporter: enabled: true image: "quay.io/opstree/redis-exporter:v1.80.1" + sentinel: + image: "quay.io/opstree/redis-sentinel:v8.4.0" + imagePullPolicy: IfNotPresent + resources: + requests: + cpu: 10m + memory: 32Mi + size: 3 diff --git a/clusters/cl01tl/manifests/outline/RedisSentinel-redis-sentinel-outline.yaml b/clusters/cl01tl/manifests/outline/RedisSentinel-redis-sentinel-outline.yaml deleted file mode 100644 index 192075d5e..000000000 --- a/clusters/cl01tl/manifests/outline/RedisSentinel-redis-sentinel-outline.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: redis.redis.opstreelabs.in/v1beta2 -kind: RedisSentinel -metadata: - name: redis-sentinel-outline - namespace: outline - 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-outline - app.kubernetes.io/instance: outline - app.kubernetes.io/part-of: outline -spec: - clusterSize: 3 - podSecurityContext: - fsGroup: 1000 - runAsUser: 1000 - redisSentinelConfig: - redisReplicationName: redis-replication-outline - 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/outline/ServiceMonitor-redis-replication-outline.yaml b/clusters/cl01tl/manifests/outline/ServiceMonitor-redis-replication-outline.yaml index 5a5e56b7e..778fff7ec 100644 --- a/clusters/cl01tl/manifests/outline/ServiceMonitor-redis-replication-outline.yaml +++ b/clusters/cl01tl/manifests/outline/ServiceMonitor-redis-replication-outline.yaml @@ -4,8 +4,8 @@ metadata: name: redis-replication-outline namespace: outline labels: - helm.sh/chart: redis-replication-0.5.0 - app.kubernetes.io/version: "0.5.0" + helm.sh/chart: redis-replication-1.0.1 + app.kubernetes.io/version: "1.0.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-outline app.kubernetes.io/instance: outline diff --git a/clusters/cl01tl/manifests/outline/ServiceMonitor-redis-sentinel-outline.yaml b/clusters/cl01tl/manifests/outline/ServiceMonitor-redis-sentinel-outline.yaml deleted file mode 100644 index 51cb6f450..000000000 --- a/clusters/cl01tl/manifests/outline/ServiceMonitor-redis-sentinel-outline.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: redis-sentinel-outline - namespace: outline - 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-outline - app.kubernetes.io/instance: outline - app.kubernetes.io/part-of: outline -spec: - selector: - matchLabels: - app: redis-sentinel-outline - redis_setup_type: sentinel - role: sentinel - endpoints: - - port: sentinel-client - interval: 30s - scrapeTimeout: 10s diff --git a/clusters/cl01tl/manifests/stalwart/RedisReplication-redis-replication-stalwart.yaml b/clusters/cl01tl/manifests/stalwart/RedisReplication-redis-replication-stalwart.yaml index ec027aab4..aa4e09f6f 100644 --- a/clusters/cl01tl/manifests/stalwart/RedisReplication-redis-replication-stalwart.yaml +++ b/clusters/cl01tl/manifests/stalwart/RedisReplication-redis-replication-stalwart.yaml @@ -4,8 +4,8 @@ metadata: name: redis-replication-stalwart namespace: stalwart labels: - helm.sh/chart: redis-replication-0.5.0 - app.kubernetes.io/version: "0.5.0" + helm.sh/chart: redis-replication-1.0.1 + app.kubernetes.io/version: "1.0.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-stalwart app.kubernetes.io/instance: stalwart @@ -34,3 +34,11 @@ spec: redisExporter: enabled: true image: "quay.io/opstree/redis-exporter:v1.80.1" + sentinel: + image: "quay.io/opstree/redis-sentinel:v8.4.0" + imagePullPolicy: IfNotPresent + resources: + requests: + cpu: 10m + memory: 32Mi + size: 3 diff --git a/clusters/cl01tl/manifests/stalwart/RedisSentinel-redis-sentinel-stalwart.yaml b/clusters/cl01tl/manifests/stalwart/RedisSentinel-redis-sentinel-stalwart.yaml deleted file mode 100644 index c3db9d436..000000000 --- a/clusters/cl01tl/manifests/stalwart/RedisSentinel-redis-sentinel-stalwart.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: redis.redis.opstreelabs.in/v1beta2 -kind: RedisSentinel -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: - fsGroup: 1000 - runAsUser: 1000 - redisSentinelConfig: - redisReplicationName: redis-replication-stalwart - 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/stalwart/ServiceMonitor-redis-replication-stalwart.yaml b/clusters/cl01tl/manifests/stalwart/ServiceMonitor-redis-replication-stalwart.yaml index c72852235..adc8408cb 100644 --- a/clusters/cl01tl/manifests/stalwart/ServiceMonitor-redis-replication-stalwart.yaml +++ b/clusters/cl01tl/manifests/stalwart/ServiceMonitor-redis-replication-stalwart.yaml @@ -4,8 +4,8 @@ metadata: name: redis-replication-stalwart namespace: stalwart labels: - helm.sh/chart: redis-replication-0.5.0 - app.kubernetes.io/version: "0.5.0" + helm.sh/chart: redis-replication-1.0.1 + app.kubernetes.io/version: "1.0.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-stalwart app.kubernetes.io/instance: stalwart diff --git a/clusters/cl01tl/manifests/stalwart/ServiceMonitor-redis-sentinel-stalwart.yaml b/clusters/cl01tl/manifests/stalwart/ServiceMonitor-redis-sentinel-stalwart.yaml deleted file mode 100644 index f57d06c05..000000000 --- a/clusters/cl01tl/manifests/stalwart/ServiceMonitor-redis-sentinel-stalwart.yaml +++ /dev/null @@ -1,22 +0,0 @@ -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 diff --git a/clusters/cl01tl/manifests/tubearchivist/RedisReplication-redis-replication-tubearchivist.yaml b/clusters/cl01tl/manifests/tubearchivist/RedisReplication-redis-replication-tubearchivist.yaml index 63122b51d..945f1f057 100644 --- a/clusters/cl01tl/manifests/tubearchivist/RedisReplication-redis-replication-tubearchivist.yaml +++ b/clusters/cl01tl/manifests/tubearchivist/RedisReplication-redis-replication-tubearchivist.yaml @@ -4,8 +4,8 @@ metadata: name: redis-replication-tubearchivist namespace: tubearchivist labels: - helm.sh/chart: redis-replication-0.5.0 - app.kubernetes.io/version: "0.5.0" + helm.sh/chart: redis-replication-1.0.1 + app.kubernetes.io/version: "1.0.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-tubearchivist app.kubernetes.io/instance: tubearchivist @@ -34,3 +34,11 @@ spec: redisExporter: enabled: true image: "quay.io/opstree/redis-exporter:v1.80.1" + sentinel: + image: "quay.io/opstree/redis-sentinel:v8.4.0" + imagePullPolicy: IfNotPresent + resources: + requests: + cpu: 10m + memory: 32Mi + size: 3 diff --git a/clusters/cl01tl/manifests/tubearchivist/RedisSentinel-redis-sentinel-tubearchivist.yaml b/clusters/cl01tl/manifests/tubearchivist/RedisSentinel-redis-sentinel-tubearchivist.yaml deleted file mode 100644 index 121635e8e..000000000 --- a/clusters/cl01tl/manifests/tubearchivist/RedisSentinel-redis-sentinel-tubearchivist.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: redis.redis.opstreelabs.in/v1beta2 -kind: RedisSentinel -metadata: - name: redis-sentinel-tubearchivist - namespace: tubearchivist - 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-tubearchivist - app.kubernetes.io/instance: tubearchivist - app.kubernetes.io/part-of: tubearchivist -spec: - clusterSize: 3 - podSecurityContext: - fsGroup: 1000 - runAsUser: 1000 - redisSentinelConfig: - redisReplicationName: redis-replication-tubearchivist - 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/tubearchivist/ServiceMonitor-redis-replication-tubearchivist.yaml b/clusters/cl01tl/manifests/tubearchivist/ServiceMonitor-redis-replication-tubearchivist.yaml index 1cbb25560..318576a5b 100644 --- a/clusters/cl01tl/manifests/tubearchivist/ServiceMonitor-redis-replication-tubearchivist.yaml +++ b/clusters/cl01tl/manifests/tubearchivist/ServiceMonitor-redis-replication-tubearchivist.yaml @@ -4,8 +4,8 @@ metadata: name: redis-replication-tubearchivist namespace: tubearchivist labels: - helm.sh/chart: redis-replication-0.5.0 - app.kubernetes.io/version: "0.5.0" + helm.sh/chart: redis-replication-1.0.1 + app.kubernetes.io/version: "1.0.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-tubearchivist app.kubernetes.io/instance: tubearchivist diff --git a/clusters/cl01tl/manifests/tubearchivist/ServiceMonitor-redis-sentinel-tubearchivist.yaml b/clusters/cl01tl/manifests/tubearchivist/ServiceMonitor-redis-sentinel-tubearchivist.yaml deleted file mode 100644 index c24727832..000000000 --- a/clusters/cl01tl/manifests/tubearchivist/ServiceMonitor-redis-sentinel-tubearchivist.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: redis-sentinel-tubearchivist - namespace: tubearchivist - 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-tubearchivist - app.kubernetes.io/instance: tubearchivist - app.kubernetes.io/part-of: tubearchivist -spec: - selector: - matchLabels: - app: redis-sentinel-tubearchivist - redis_setup_type: sentinel - role: sentinel - endpoints: - - port: sentinel-client - interval: 30s - scrapeTimeout: 10s diff --git a/clusters/cl01tl/manifests/yamtrack/RedisReplication-redis-replication-yamtrack.yaml b/clusters/cl01tl/manifests/yamtrack/RedisReplication-redis-replication-yamtrack.yaml index 6146d89c7..625a2b457 100644 --- a/clusters/cl01tl/manifests/yamtrack/RedisReplication-redis-replication-yamtrack.yaml +++ b/clusters/cl01tl/manifests/yamtrack/RedisReplication-redis-replication-yamtrack.yaml @@ -4,8 +4,8 @@ metadata: name: redis-replication-yamtrack namespace: yamtrack labels: - helm.sh/chart: redis-replication-0.5.0 - app.kubernetes.io/version: "0.5.0" + helm.sh/chart: redis-replication-1.0.1 + app.kubernetes.io/version: "1.0.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-yamtrack app.kubernetes.io/instance: yamtrack @@ -34,3 +34,11 @@ spec: redisExporter: enabled: true image: "quay.io/opstree/redis-exporter:v1.80.1" + sentinel: + image: "quay.io/opstree/redis-sentinel:v8.4.0" + imagePullPolicy: IfNotPresent + resources: + requests: + cpu: 10m + memory: 32Mi + size: 3 diff --git a/clusters/cl01tl/manifests/yamtrack/RedisSentinel-redis-sentinel-yamtrack.yaml b/clusters/cl01tl/manifests/yamtrack/RedisSentinel-redis-sentinel-yamtrack.yaml deleted file mode 100644 index fc4db5932..000000000 --- a/clusters/cl01tl/manifests/yamtrack/RedisSentinel-redis-sentinel-yamtrack.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: redis.redis.opstreelabs.in/v1beta2 -kind: RedisSentinel -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: - fsGroup: 1000 - runAsUser: 1000 - redisSentinelConfig: - redisReplicationName: redis-replication-yamtrack - 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/yamtrack/ServiceMonitor-redis-replication-yamtrack.yaml b/clusters/cl01tl/manifests/yamtrack/ServiceMonitor-redis-replication-yamtrack.yaml index f1ed7726b..73be861be 100644 --- a/clusters/cl01tl/manifests/yamtrack/ServiceMonitor-redis-replication-yamtrack.yaml +++ b/clusters/cl01tl/manifests/yamtrack/ServiceMonitor-redis-replication-yamtrack.yaml @@ -4,8 +4,8 @@ metadata: name: redis-replication-yamtrack namespace: yamtrack labels: - helm.sh/chart: redis-replication-0.5.0 - app.kubernetes.io/version: "0.5.0" + helm.sh/chart: redis-replication-1.0.1 + app.kubernetes.io/version: "1.0.1" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-yamtrack app.kubernetes.io/instance: yamtrack diff --git a/clusters/cl01tl/manifests/yamtrack/ServiceMonitor-redis-sentinel-yamtrack.yaml b/clusters/cl01tl/manifests/yamtrack/ServiceMonitor-redis-sentinel-yamtrack.yaml deleted file mode 100644 index 5486a19c5..000000000 --- a/clusters/cl01tl/manifests/yamtrack/ServiceMonitor-redis-sentinel-yamtrack.yaml +++ /dev/null @@ -1,22 +0,0 @@ -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