fix: use unified external redis for sorcerer and atlantis

apps/staging-atlantis.yaml

@@ -28,7 +28,7 @@ spec:
     chart: redis
     helm:
       valueFiles:
-      - $values/values/atlantis/staging/redis.yaml
+      - $values/values/redis/values-staging.yaml
   ignoreDifferences:
     - kind: Secret
       name: azure-keyvault

apps/staging-sorcerer.yaml

@@ -23,6 +23,12 @@ spec:
         string: staging
       - name: hostname
         string: sorcerer.ekman.oceanbox.io
+  - repoURL: https://charts.bitnami.com/bitnami
+    targetRevision: 20.1.7
+    chart: redis
+    helm:
+      valueFiles:
+      - $values/values/redis/values-staging.yaml
   ignoreDifferences:
     - kind: Secret
       name: azure-keyvault

charts/sorcerer/Chart.yaml

@@ -4,9 +4,3 @@ description: A Helm chart for Kubernetes
 type: application
 version: v4.9.0
 appVersion: v4.9.0
-dependencies:
-  - name: redis
-    version: 20.1.7
-    repository: https://charts.bitnami.com/bitnami
-    condition: redis.enabled
-    alias: redis

charts/sorcerer/values.yaml

@@ -89,41 +89,6 @@ cluster:
   backupRetention: 60d
   size: 5Gi
 
-redis:
-  enabled: true
-  image:
-    repository: redis/redis-stack-server
-    tag: 7.2.0-v10
-  architecture: standalone
-  replica:
-    replicaCount: 1
-    command:
-      - "/opt/redis-stack/bin/redis-server"
-      - "--loadmodule"
-      - "/opt/redis-stack/lib/redisearch.so"
-      - "MAXSEARCHRESULTS"
-      - "10000"
-      - "MAXAGGREGATERESULTS"
-      - "10000"
-      - "--loadmodule"
-      - "/opt/redis-stack/lib/rejson.so"
-  auth:
-    enabled: true
-    sentinel: true
-    password: ""
-    usePasswordFiles: false
-    existingSecretPasswordKey: ""
-    # existingSecret: staging-redis
-  master:
-    resources:
-      limits:
-        ephemeral-storage: 1024Mi
-        memory: 192Mi
-      requests:
-        cpu: 150m
-        ephemeral-storage: 50Mi
-        memory: 128Mi
-
 resources: {}
 # We usually recommend not to specify default resources and to leave this as a conscious
 # choice for the user. This also increases chances charts run on environments with little

values/atlantis/prod/redis.yaml

@@ -1,37 +0,0 @@
-image:
-  repository: redis/redis-stack-server
-  tag: 7.2.0-v10
-
-architecture: replication
-
-replica:
-  replicaCount: 2
-  command:
-    - "/opt/redis-stack/bin/redis-server"
-    - "--loadmodule"
-    - "/opt/redis-stack/lib/redisearch.so"
-    - "MAXSEARCHRESULTS"
-    - "10000"
-    - "MAXAGGREGATERESULTS"
-    - "10000"
-    - "--loadmodule"
-    - "/opt/redis-stack/lib/rejson.so"
-
-auth:
-  enabled: true
-  sentinel: true
-  password: ""
-  usePasswordFiles: false
-  existingSecretPasswordKey: ""
-  # existingSecret: staging-redis
-
-master:
-  resources:
-    limits:
-      ephemeral-storage: 1024Mi
-      memory: 192Mi
-    requests:
-      cpu: 150m
-      ephemeral-storage: 50Mi
-      memory: 128Mi
-

values/atlantis/staging/redis.yaml

@@ -1,37 +0,0 @@
-image:
-  repository: redis/redis-stack-server
-  tag: 7.2.0-v10
-
-architecture: standalone
-
-replica:
-  replicaCount: 1
-  command:
-    - "/opt/redis-stack/bin/redis-server"
-    - "--loadmodule"
-    - "/opt/redis-stack/lib/redisearch.so"
-    - "MAXSEARCHRESULTS"
-    - "10000"
-    - "MAXAGGREGATERESULTS"
-    - "10000"
-    - "--loadmodule"
-    - "/opt/redis-stack/lib/rejson.so"
-
-auth:
-  enabled: true
-  sentinel: true
-  password: ""
-  usePasswordFiles: false
-  existingSecretPasswordKey: ""
-  # existingSecret: staging-redis
-
-master:
-  resources:
-    limits:
-      ephemeral-storage: 1024Mi
-      memory: 192Mi
-    requests:
-      cpu: 150m
-      ephemeral-storage: 50Mi
-      memory: 128Mi
-

values/redis/values-prod.yaml

@@ -1,17 +1,33 @@
+image:
+  repository: redis/redis-stack-server
+  tag: 7.2.0-v10
+
 architecture: replication
 
+replica:
+  replicaCount: 2
+  command:
+    - "/opt/redis-stack/bin/redis-server"
+    - "--loadmodule"
+    - "/opt/redis-stack/lib/redisearch.so"
+    - "MAXSEARCHRESULTS"
+    - "10000"
+    - "MAXAGGREGATERESULTS"
+    - "10000"
+    - "--loadmodule"
+    - "/opt/redis-stack/lib/rejson.so"
+
 auth:
   enabled: true
   sentinel: true
   password: ""
   usePasswordFiles: false
   existingSecretPasswordKey: ""
-  existingSecret: prod-redis
+  # existingSecret: staging-redis
 
 master:
   resources:
     limits:
-      cpu: null
       ephemeral-storage: 1024Mi
       memory: 192Mi
     requests:
@@ -19,14 +35,3 @@ master:
       ephemeral-storage: 50Mi
       memory: 128Mi
 
-replica:
-  replicaCount: 2
-  resources:
-    limits:
-      cpu: null
-      ephemeral-storage: 1024Mi
-      memory: 192Mi
-    requests:
-      cpu: 150m
-      ephemeral-storage: 50Mi
-      memory: 128Mi

values/redis/values-staging.yaml

@@ -1,7 +1,21 @@
+image:
+  repository: redis/redis-stack-server
+  tag: 7.2.0-v10
+
 architecture: standalone
 
 replica:
   replicaCount: 1
+  command:
+    - "/opt/redis-stack/bin/redis-server"
+    - "--loadmodule"
+    - "/opt/redis-stack/lib/redisearch.so"
+    - "MAXSEARCHRESULTS"
+    - "10000"
+    - "MAXAGGREGATERESULTS"
+    - "10000"
+    - "--loadmodule"
+    - "/opt/redis-stack/lib/rejson.so"
 
 auth:
   enabled: true
@@ -9,15 +23,15 @@ auth:
   password: ""
   usePasswordFiles: false
   existingSecretPasswordKey: ""
-  existingSecret: staging-redis
+  # existingSecret: staging-redis
 
 master:
   resources:
     limits:
-      cpu: null
       ephemeral-storage: 1024Mi
       memory: 192Mi
     requests:
       cpu: 150m
       ephemeral-storage: 50Mi
       memory: 128Mi
+