From c2b6ecddbacac072387666223dc64e9c92e35992 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20J=C3=B6rg?= Date: Thu, 13 Nov 2025 10:06:40 +0100 Subject: [PATCH] fix(atlantis): Setup Redis Operator for staging --- charts/atlantis/templates/redis.yaml | 18 ++++++------------ charts/atlantis/values.yaml | 9 ++++++--- charts/sorcerer/templates/redis.yaml | 3 --- charts/sorcerer/values.yaml | 4 ++-- .../atlantis/values/values-staging.yaml.gotmpl | 18 ++++++++++++++++++ 5 files changed, 32 insertions(+), 20 deletions(-) diff --git a/charts/atlantis/templates/redis.yaml b/charts/atlantis/templates/redis.yaml index dcff5019..50336e30 100644 --- a/charts/atlantis/templates/redis.yaml +++ b/charts/atlantis/templates/redis.yaml @@ -8,13 +8,15 @@ metadata: linkerd.io/inject: disabled labels: app.kubernetes.io/created-by: dragonfly-operator - app.kubernetes.io/instance: dragonfly {{- include "Atlantis.labels" . | nindent 4 }} spec: args: + - --dbfilename=dump # Static filename prevents disk exhaustion - --maxmemory=$(MAX_MEMORY)Mi # Graceful memory management (90% of limit) - --proactor_threads=1 # Auto-detect CPU cores (optimal threading) - --cluster_mode=emulated + - --logtostderr + - --save_schedule= # Disable continuous saves (cron snapshots only) env: - name: MAX_MEMORY valueFrom: @@ -24,19 +26,14 @@ spec: replicas: {{ .Values.redis.replicas | default "1" }} resources: requests: - cpu: 150m + cpu: {{ .Values.redis.resources.cpu | default "150m" }} + memory: {{ .Values.redis.resources.memory | default "256Mi"}} limits: - memory: 256Mi + memory: {{ .Values.redis.resources.memory | default "256Mi"}} authentication: passwordFromSecret: name: {{ .Values.redis.secret.name | quote }} key: {{ .Values.redis.secret.key | quote }} - metrics: - enabled: {{ .Values.redis.metrics.enabled | default false }} - port: 6379 - storage: - requests: - storage: {{ .Values.redis.size | default "1Gi" }} {{- if .Values.redis.backup.enabled }} snapshot: dir: /data # Change to s3://redis/prod-atlantis-redis @@ -49,7 +46,4 @@ spec: requests: storage: {{ .Values.redis.size | default "1Gi" }} {{- end }} - podSecurityContext: - runAsUser: 1000 - fsGroup: 1000 {{- end}} diff --git a/charts/atlantis/values.yaml b/charts/atlantis/values.yaml index 168c92cc..a6cc8e52 100644 --- a/charts/atlantis/values.yaml +++ b/charts/atlantis/values.yaml @@ -67,19 +67,22 @@ ingress: - hosts: - atlantis.srv.oceanbox.io secretName: atlantis-tls + persistence: enabled: false size: 1G storageClass: "" accessMode: ReadWriteOnce + redis: enabled: false instances: 1 - metrics: - enabled: false + # metrics: + # enabled: false backup: enabled: false - size: 1Gi + size: 5Gi + cluster: enabled: true instances: 1 diff --git a/charts/sorcerer/templates/redis.yaml b/charts/sorcerer/templates/redis.yaml index 2aeeed59..ae83fe2b 100644 --- a/charts/sorcerer/templates/redis.yaml +++ b/charts/sorcerer/templates/redis.yaml @@ -34,9 +34,6 @@ spec: passwordFromSecret: name: {{ .Values.redis.secret.name | quote }} key: {{ .Values.redis.secret.key | quote }} - # metrics: - # enabled: {{ .Values.redis.metrics.enabled | default false }} - # port: 6379 {{- if .Values.redis.backup.enabled }} snapshot: dir: /data # Change to s3://redis/prod-atlantis-redis diff --git a/charts/sorcerer/values.yaml b/charts/sorcerer/values.yaml index c45a46d8..7447a915 100644 --- a/charts/sorcerer/values.yaml +++ b/charts/sorcerer/values.yaml @@ -74,8 +74,8 @@ persistence: redis: enabled: false instances: 1 - metrics: - enabled: false + # metrics: + # enabled: false backup: enabled: false size: 1Gi diff --git a/values/atlantis/values/values-staging.yaml.gotmpl b/values/atlantis/values/values-staging.yaml.gotmpl index 91ca5c13..94d54d9c 100644 --- a/values/atlantis/values/values-staging.yaml.gotmpl +++ b/values/atlantis/values/values-staging.yaml.gotmpl @@ -1,8 +1,11 @@ replicaCount: 1 + image: tag: f8940c92-debug + podAnnotations: dapr.io/app-id: "staging-atlantis" + env: - name: APP_NAMESPACE value: staging-atlantis @@ -38,6 +41,7 @@ env: secretKeyRef: name: dapr-api-token key: token + ingress: enabled: true annotations: @@ -88,6 +92,7 @@ ingress: - atlantis.beta.oceanbox.io - atlas.oceanbox.io secretName: staging-atlantis-tls + cluster: instances: 1 backup: @@ -97,6 +102,7 @@ cluster: source: db: prod-atlantis-db namespace: prod-atlantis + resources: limits: cpu: 250m @@ -104,3 +110,15 @@ resources: requests: cpu: 250m memory: 1Gi + +redis: + enabled: true + size: 2Gi + secret: + name: staging-atlantis-redis + key: redis-password + backup: + enabled: true + resources: + cpu: 150m + memory: 256Mi