From ea7c027a63699e029c7cb274a9363fa30a396b85 Mon Sep 17 00:00:00 2001
From: Andrew Kostka <andrew.kostka@wikimedia.de>
Date: Mon, 25 Nov 2024 13:53:51 +0100
Subject: [PATCH] argocd: add redis-2 on staging (#1864)

---
 k8s/argocd/local/redis-2.values.yaml      | 60 +++++++++++++++++++++++
 k8s/argocd/production/redis-2.values.yaml | 51 +++++++++++++++++++
 k8s/argocd/staging/redis-2.values.yaml    | 51 +++++++++++++++++++
 k8s/helmfile/helmfile.yaml                |  2 +-
 4 files changed, 163 insertions(+), 1 deletion(-)
 create mode 100644 k8s/argocd/local/redis-2.values.yaml
 create mode 100644 k8s/argocd/production/redis-2.values.yaml
 create mode 100644 k8s/argocd/staging/redis-2.values.yaml

diff --git a/k8s/argocd/local/redis-2.values.yaml b/k8s/argocd/local/redis-2.values.yaml
new file mode 100644
index 000000000..756b3d22c
--- /dev/null
+++ b/k8s/argocd/local/redis-2.values.yaml
@@ -0,0 +1,60 @@
+architecture: replication
+auth:
+  enabled: true
+  existingSecret: redis-password
+  existingSecretPasswordKey: password
+commonConfiguration: |
+  # Enable AOF https://redis.io/topics/persistence#append-only-file
+  appendonly yes
+  # Disable RDB persistence, AOF persistence already enabled.
+  save ""
+  # Control memory usage
+  maxmemory 50mb
+  maxmemory-policy volatile-lru
+  # Auto AOF file rewriting
+  auto-aof-rewrite-percentage 100
+  auto-aof-rewrite-min-size 60mb
+master:
+  livenessProbe:
+    enabled: false
+  persistence:
+    accessModes:
+      - ReadWriteOnce
+    enabled: true
+    path: /data
+    size: 1Gi
+    storageClass: null
+    subPath: ""
+  readinessProbe:
+    enabled: false
+  resources:
+    limits:
+      cpu: 50m
+      memory: 90Mi
+    requests:
+      cpu: 10m
+      memory: 62Mi
+redisPort: 6379
+replica:
+  livenessProbe:
+    enabled: false
+  persistence:
+    accessModes:
+      - ReadWriteOnce
+    enabled: true
+    path: /data
+    size: 1Gi
+    storageClass: null
+    subPath: ""
+  readinessProbe:
+    enabled: false
+  replicaCount: 1
+  resources:
+    limits:
+      cpu: 50m
+      memory: 90Mi
+    requests:
+      cpu: 10m
+      memory: 60Mi
+sentinel:
+  enabled: false
diff --git a/k8s/argocd/production/redis-2.values.yaml b/k8s/argocd/production/redis-2.values.yaml
new file mode 100644
index 000000000..f44a2519f
--- /dev/null
+++ b/k8s/argocd/production/redis-2.values.yaml
@@ -0,0 +1,51 @@
+architecture: replication
+auth:
+  enabled: true
+  existingSecret: redis-password
+  existingSecretPasswordKey: password
+commonConfiguration: |
+  # Enable AOF https://redis.io/topics/persistence#append-only-file
+  appendonly yes
+  # Disable RDB persistence, AOF persistence already enabled.
+  save ""
+  # Control memory usage
+  maxmemory 75mb
+  maxmemory-policy volatile-lru
+  # Auto AOF file rewriting
+  auto-aof-rewrite-percentage 100
+  auto-aof-rewrite-min-size 85mb
+master:
+  persistence:
+    accessModes:
+      - ReadWriteOnce
+    enabled: true
+    path: /data
+    size: 1Gi
+    storageClass: premium-rwo
+    subPath: ""
+  resources:
+    limits:
+      cpu: 500m
+      memory: 500Mi
+    requests:
+      cpu: 500m
+      memory: 500Mi
+redisPort: 6379
+replica:
+  persistence:
+    accessModes:
+      - ReadWriteOnce
+    enabled: true
+    path: /data
+    size: 1Gi
+    storageClass: premium-rwo
+    subPath: ""
+  replicaCount: 1
+  resources:
+    limits:
+      memory: 250Mi
+    requests:
+      cpu: 500m
+      memory: 250Mi
+sentinel:
+  enabled: false
diff --git a/k8s/argocd/staging/redis-2.values.yaml b/k8s/argocd/staging/redis-2.values.yaml
new file mode 100644
index 000000000..f44a2519f
--- /dev/null
+++ b/k8s/argocd/staging/redis-2.values.yaml
@@ -0,0 +1,51 @@
+architecture: replication
+auth:
+  enabled: true
+  existingSecret: redis-password
+  existingSecretPasswordKey: password
+commonConfiguration: |
+  # Enable AOF https://redis.io/topics/persistence#append-only-file
+  appendonly yes
+  # Disable RDB persistence, AOF persistence already enabled.
+  save ""
+  # Control memory usage
+  maxmemory 75mb
+  maxmemory-policy volatile-lru
+  # Auto AOF file rewriting
+  auto-aof-rewrite-percentage 100
+  auto-aof-rewrite-min-size 85mb
+master:
+  persistence:
+    accessModes:
+      - ReadWriteOnce
+    enabled: true
+    path: /data
+    size: 1Gi
+    storageClass: premium-rwo
+    subPath: ""
+  resources:
+    limits:
+      cpu: 500m
+      memory: 500Mi
+    requests:
+      cpu: 500m
+      memory: 500Mi
+redisPort: 6379
+replica:
+  persistence:
+    accessModes:
+      - ReadWriteOnce
+    enabled: true
+    path: /data
+    size: 1Gi
+    storageClass: premium-rwo
+    subPath: ""
+  replicaCount: 1
+  resources:
+    limits:
+      memory: 250Mi
+    requests:
+      cpu: 500m
+      memory: 250Mi
+sentinel:
+  enabled: false
diff --git a/k8s/helmfile/helmfile.yaml b/k8s/helmfile/helmfile.yaml
index f5c992cd6..d741e1f16 100644
--- a/k8s/helmfile/helmfile.yaml
+++ b/k8s/helmfile/helmfile.yaml
@@ -109,7 +109,7 @@ releases:
   - name: argocd-config
     namespace: argocd
     chart: wbstack/argocd-config
-    version: 1.0.9
+    version: '{{ if eq .Environment.Name "production" }} 1.0.9 {{ else }} 1.0.10 {{ end }}'
     <<: *default_release
 
   - name: redirects