From 1a391187632183d9422a9c26f8746f9c397aa1e3 Mon Sep 17 00:00:00 2001 From: Jonas Juselius Date: Mon, 23 Dec 2024 07:31:14 +0100 Subject: [PATCH] fix: use unified external redis for sorcerer and atlantis --- apps/staging-atlantis.yaml | 2 +- apps/staging-sorcerer.yaml | 6 +++++ charts/sorcerer/Chart.yaml | 6 ----- charts/sorcerer/values.yaml | 35 ---------------------------- values/atlantis/prod/redis.yaml | 37 ------------------------------ values/atlantis/staging/redis.yaml | 37 ------------------------------ values/redis/values-prod.yaml | 31 ++++++++++++++----------- values/redis/values-staging.yaml | 18 +++++++++++++-- 8 files changed, 41 insertions(+), 131 deletions(-) delete mode 100644 values/atlantis/prod/redis.yaml delete mode 100644 values/atlantis/staging/redis.yaml diff --git a/apps/staging-atlantis.yaml b/apps/staging-atlantis.yaml index 8a25e64a..f4c9e268 100644 --- a/apps/staging-atlantis.yaml +++ b/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 diff --git a/apps/staging-sorcerer.yaml b/apps/staging-sorcerer.yaml index e133bc40..bab73dcd 100644 --- a/apps/staging-sorcerer.yaml +++ b/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 diff --git a/charts/sorcerer/Chart.yaml b/charts/sorcerer/Chart.yaml index f5351134..65bf96f8 100644 --- a/charts/sorcerer/Chart.yaml +++ b/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 diff --git a/charts/sorcerer/values.yaml b/charts/sorcerer/values.yaml index 5c05580b..6a6d6930 100644 --- a/charts/sorcerer/values.yaml +++ b/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 diff --git a/values/atlantis/prod/redis.yaml b/values/atlantis/prod/redis.yaml deleted file mode 100644 index 357fe4aa..00000000 --- a/values/atlantis/prod/redis.yaml +++ /dev/null @@ -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 - diff --git a/values/atlantis/staging/redis.yaml b/values/atlantis/staging/redis.yaml deleted file mode 100644 index 05c8096a..00000000 --- a/values/atlantis/staging/redis.yaml +++ /dev/null @@ -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 - diff --git a/values/redis/values-prod.yaml b/values/redis/values-prod.yaml index 9ad05ef1..357fe4aa 100644 --- a/values/redis/values-prod.yaml +++ b/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 diff --git a/values/redis/values-staging.yaml b/values/redis/values-staging.yaml index 85f100a4..05c8096a 100644 --- a/values/redis/values-staging.yaml +++ b/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 +