diff --git a/clusters/cl01tl/monitoring/grafana-operator/Chart.yaml b/clusters/cl01tl/monitoring/grafana-operator/Chart.yaml index 5d6808fe4..8a7074b82 100644 --- a/clusters/cl01tl/monitoring/grafana-operator/Chart.yaml +++ b/clusters/cl01tl/monitoring/grafana-operator/Chart.yaml @@ -12,7 +12,6 @@ sources: - https://github.com/grafana/grafana-operator - https://github.com/cloudnative-pg/cloudnative-pg - https://github.com/grafana/grafana-operator/tree/master/deploy/helm/grafana-operator - - https://github.com/bitnami/charts/tree/main/bitnami/valkey - https://gitea.alexlebens.dev/alexlebens/helm-charts/src/branch/main/charts/postgres-cluster maintainers: - name: alexlebens @@ -20,14 +19,6 @@ dependencies: - name: grafana-operator version: v5.18.0 repository: https://grafana.github.io/helm-charts - - name: valkey - alias: valkey-unified-alerting - version: 3.0.22 - repository: oci://harbor.alexlebens.net/proxy-registry-1.docker.io/bitnamicharts - - name: valkey - alias: valkey-remote-cache - version: 3.0.22 - repository: oci://harbor.alexlebens.net/proxy-registry-1.docker.io/bitnamicharts - name: postgres-cluster alias: postgres-17-cluster version: 5.1.0 diff --git a/clusters/cl01tl/monitoring/grafana-operator/templates/grafana.yaml b/clusters/cl01tl/monitoring/grafana-operator/templates/grafana.yaml index 29076c302..d3acf692f 100644 --- a/clusters/cl01tl/monitoring/grafana-operator/templates/grafana.yaml +++ b/clusters/cl01tl/monitoring/grafana-operator/templates/grafana.yaml @@ -45,10 +45,10 @@ spec: password: ${DB_PASSWORD} remote_cache: type: redis - connstr: addr=remote-cache-valkey-primary.grafana-operator:6379,pool_size=100,db=0,ssl=false + connstr: addr=redis-replication-remote-cache-master.grafana-operator:6379,pool_size=100,db=0,ssl=false unified_alerting: enabled: "true" - ha_redis_address: unified-alerting-valkey-primary.grafana-operator:6379 + ha_redis_address: redis-replication-unified-alerting-master.grafana-operator:6379 deployment: spec: replicas: 3 diff --git a/clusters/cl01tl/monitoring/grafana-operator/values.yaml b/clusters/cl01tl/monitoring/grafana-operator/values.yaml index e8125d2f2..bcbd29602 100644 --- a/clusters/cl01tl/monitoring/grafana-operator/values.yaml +++ b/clusters/cl01tl/monitoring/grafana-operator/values.yaml @@ -12,50 +12,6 @@ grafana-operator: enabled: true dashboard: enabled: false -valkey-unified-alerting: - fullnameOverride: unified-alerting-valkey - architecture: standalone - auth: - enabled: false - usePasswordFiles: false - primary: - resources: - requests: - cpu: 100m - memory: 64Mi - persistence: - enabled: true - size: 1Gi - replica: - resources: - requests: - cpu: 100m - memory: 64Mi - persistence: - enabled: false -valkey-remote-cache: - fullnameOverride: remote-cache-valkey - architecture: replication - auth: - enabled: false - usePasswordFiles: false - primary: - resources: - requests: - cpu: 100m - memory: 64Mi - persistence: - enabled: true - size: 1Gi - replica: - replicaCount: 1 - resources: - requests: - cpu: 100m - memory: 64Mi - persistence: - enabled: true - size: 1Gi postgres-17-cluster: mode: standalone cluster: