From ab7958281f65b58ec6998bf47a0bd1e957a83973 Mon Sep 17 00:00:00 2001
From: Andrew Kostka <andrew.kostka@wikimedia.de>
Date: Mon, 25 Nov 2024 15:43:35 +0000
Subject: [PATCH] redis: stop using Helmfile to generate cluster values

---
 .github/workflows/check-generated-values.yml  |  2 +-
 .../env/local/redis.values.yaml.gotmpl        | 44 --------------
 .../env/production/redis.values.yaml.gotmpl   | 58 -------------------
 .../env/staging/redis.values.yaml.gotmpl      |  1 -
 .../only-for-argo-value-generation.yaml       |  6 --
 5 files changed, 1 insertion(+), 110 deletions(-)
 delete mode 100644 k8s/helmfile/env/local/redis.values.yaml.gotmpl
 delete mode 100644 k8s/helmfile/env/production/redis.values.yaml.gotmpl
 delete mode 100644 k8s/helmfile/env/staging/redis.values.yaml.gotmpl

diff --git a/.github/workflows/check-generated-values.yml b/.github/workflows/check-generated-values.yml
index 8f024a0bf..5d31d9861 100644
--- a/.github/workflows/check-generated-values.yml
+++ b/.github/workflows/check-generated-values.yml
@@ -18,7 +18,7 @@ jobs:
               RELEASE=$(basename "${RELEASE_FILE}" .values.yaml)
               TMP_VALUES=$(mktemp)
 
-              if [[ $RELEASE =~ ^(app-of-apps|redis-2)$ ]]; then
+              if [[ $RELEASE =~ ^(app-of-apps|redis-2|redis)$ ]]; then
                 echo "skipping - $RELEASE_FILE - [$ENV] [$RELEASE]"
                 continue
               fi
diff --git a/k8s/helmfile/env/local/redis.values.yaml.gotmpl b/k8s/helmfile/env/local/redis.values.yaml.gotmpl
deleted file mode 100644
index 1e678af9e..000000000
--- a/k8s/helmfile/env/local/redis.values.yaml.gotmpl
+++ /dev/null
@@ -1,44 +0,0 @@
-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:
-  persistence:
-    storageClass: null
-  livenessProbe:
-    enabled: false
-  readinessProbe:
-    enabled: false
-  resources:
-    requests:
-      cpu: 10m
-      memory: 62Mi
-    # Internal limit is 90MB, this for now just stops runaway redis..
-    limits:
-      cpu: 50m
-      memory: 90Mi
-
-replica:
-  persistence:
-    storageClass: null
-  livenessProbe:
-    enabled: false
-  readinessProbe:
-    enabled: false
-  resources:
-    requests:
-      cpu: 10m
-      # 60Mi based on usage seen on 21 December 2019 (after memory limits in place)
-      memory: 60Mi
-    # Internal limit is 90MB, this for now just stops runaway redis..
-    limits:
-      cpu: 50m
-      memory: 90Mi
diff --git a/k8s/helmfile/env/production/redis.values.yaml.gotmpl b/k8s/helmfile/env/production/redis.values.yaml.gotmpl
deleted file mode 100644
index 6abfa36e2..000000000
--- a/k8s/helmfile/env/production/redis.values.yaml.gotmpl
+++ /dev/null
@@ -1,58 +0,0 @@
-redisPort: 6379
-
-architecture: "replication"
-
-sentinel:
-  enabled: false
-
-auth:
-  enabled: true
-  existingSecret: redis-password
-  existingSecretPasswordKey: password
-
-master:
-  persistence:
-    enabled: true
-    path: /data
-    subPath: ""
-    accessModes:
-      - ReadWriteOnce
-    size: 1Gi
-    storageClass: premium-rwo
-  resources:
-    requests:
-      cpu: 500m
-      memory: 500Mi
-    # Internal limit is 75MB, this for now just stops runaway redis..
-    limits:
-      cpu: 500m
-      memory: 500Mi
-
-replica:
-  replicaCount: 1
-  persistence:
-    enabled: true
-    path: /data
-    subPath: ""
-    accessModes:
-      - ReadWriteOnce
-    size: 1Gi
-    storageClass: premium-rwo
-  resources:
-    requests:
-      cpu: 500m
-      memory: 250Mi
-    limits:
-      memory: 250Mi
-
-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
diff --git a/k8s/helmfile/env/staging/redis.values.yaml.gotmpl b/k8s/helmfile/env/staging/redis.values.yaml.gotmpl
deleted file mode 100644
index b4eac8383..000000000
--- a/k8s/helmfile/env/staging/redis.values.yaml.gotmpl
+++ /dev/null
@@ -1 +0,0 @@
-# staging uses production configuration so this is an empty file
diff --git a/k8s/helmfile/only-for-argo-value-generation.yaml b/k8s/helmfile/only-for-argo-value-generation.yaml
index 075c4ba3b..85c3abd3e 100644
--- a/k8s/helmfile/only-for-argo-value-generation.yaml
+++ b/k8s/helmfile/only-for-argo-value-generation.yaml
@@ -59,9 +59,3 @@ releases:
     chart: wbstack/ui
     version: 0.3.1
     <<: *default_release
-
-  - name: redis
-    namespace: default
-    chart: bitnami/redis
-    version: 17.3.8
-    <<: *default_release