From f4696ff0bb2021c9641e48a8293e830f8e028151 Mon Sep 17 00:00:00 2001
From: Joseph Hanson <joe@veri.dev>
Date: Wed, 1 Nov 2023 15:12:21 -0500
Subject: [PATCH] Remove redis-operator and added bitnami redis.

---
 kubernetes/apps/database/kustomization.yaml   |  2 +-
 .../redis-operator/app/helmrelease.yaml       | 35 -------------
 .../apps/database/redis/app/helmrelease.yaml  | 51 +++++++++++++++++++
 .../app/kustomization.yaml                    |  0
 .../{redis-operator => redis}/ks.yaml         | 10 ++--
 5 files changed, 58 insertions(+), 40 deletions(-)
 delete mode 100644 kubernetes/apps/database/redis-operator/app/helmrelease.yaml
 create mode 100644 kubernetes/apps/database/redis/app/helmrelease.yaml
 rename kubernetes/apps/database/{redis-operator => redis}/app/kustomization.yaml (100%)
 rename kubernetes/apps/database/{redis-operator => redis}/ks.yaml (65%)

diff --git a/kubernetes/apps/database/kustomization.yaml b/kubernetes/apps/database/kustomization.yaml
index 8b62f87..dd8a772 100644
--- a/kubernetes/apps/database/kustomization.yaml
+++ b/kubernetes/apps/database/kustomization.yaml
@@ -7,4 +7,4 @@ resources:
   - ./namespace.yaml
   # Flux-Kustomizations
   - ./crunchy-postgres/ks.yaml
-  - ./redis-operator/ks.yaml
+  - ./redis/ks.yaml
diff --git a/kubernetes/apps/database/redis-operator/app/helmrelease.yaml b/kubernetes/apps/database/redis-operator/app/helmrelease.yaml
deleted file mode 100644
index 2e57b41..0000000
--- a/kubernetes/apps/database/redis-operator/app/helmrelease.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-# yaml-language-server: $schema=https://ks.hsn.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta1.json
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
-kind: HelmRelease
-metadata:
-  name: redis-operator
-  namespace: database
-spec:
-  interval: 30m
-  chart:
-    spec:
-      chart: redis-operator
-      version: 3.2.7
-      sourceRef:
-        kind: HelmRepository
-        name: redis-operator
-        namespace: flux-system
-  maxHistory: 2
-  install:
-    crds: CreateReplace
-    remediation:
-      retries: 3
-  upgrade:
-    cleanupOnFail: true
-    crds: CreateReplace
-    remediation:
-      retries: 3
-  uninstall:
-    keepHistory: false
-  values:
-    monitoring:
-      enabled: true
-      serviceMonitor: true
-      prometheus:
-        name: default
diff --git a/kubernetes/apps/database/redis/app/helmrelease.yaml b/kubernetes/apps/database/redis/app/helmrelease.yaml
new file mode 100644
index 0000000..37fa4da
--- /dev/null
+++ b/kubernetes/apps/database/redis/app/helmrelease.yaml
@@ -0,0 +1,51 @@
+---
+# yaml-language-server: $schema=https://ks.hsn.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta1.json
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
+kind: HelmRelease
+metadata:
+  name: redis
+  namespace: database
+spec:
+  interval: 30m
+  timeout: 15m
+  chart:
+    spec:
+      chart: redis
+      version: 18.2.0
+      sourceRef:
+        kind: HelmRepository
+        name: bitnami
+        namespace: flux-system
+  maxHistory: 2
+  install:
+    remediation:
+      retries: 3
+  upgrade:
+    cleanupOnFail: true
+    remediation:
+      retries: 3
+  uninstall:
+    keepHistory: false
+  values:
+    auth:
+      enabled: false
+      sentinel: false
+    master:
+      persistence:
+        enabled: false
+    replica:
+      persistence:
+        enabled: false
+    sentinel:
+      enabled: true
+      masterSet: redis-master
+      getMasterTimeout: 10
+      startupProbe:
+        failureThreshold: 2
+      persistence:
+        enabled: false
+    metrics:
+      enabled: true
+      serviceMonitor:
+        enabled: true
+        interval: 1m
diff --git a/kubernetes/apps/database/redis-operator/app/kustomization.yaml b/kubernetes/apps/database/redis/app/kustomization.yaml
similarity index 100%
rename from kubernetes/apps/database/redis-operator/app/kustomization.yaml
rename to kubernetes/apps/database/redis/app/kustomization.yaml
diff --git a/kubernetes/apps/database/redis-operator/ks.yaml b/kubernetes/apps/database/redis/ks.yaml
similarity index 65%
rename from kubernetes/apps/database/redis-operator/ks.yaml
rename to kubernetes/apps/database/redis/ks.yaml
index 2f285ce..23da03c 100644
--- a/kubernetes/apps/database/redis-operator/ks.yaml
+++ b/kubernetes/apps/database/redis/ks.yaml
@@ -3,15 +3,17 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: cluster-apps-redis-operator
+  name: cluster-apps-redis
   namespace: flux-system
 spec:
-  path: ./kubernetes/apps/database/redis-operator/app
+  dependsOn:
+    - name: cluster-apps-external-secrets-stores
+  path: ./kubernetes/apps/database/redis/app
   prune: true
   sourceRef:
     kind: GitRepository
     name: valinor
-  wait: true
+  wait: false
   interval: 30m
   retryInterval: 1m
-  timeout: 5m
+  timeout: 15m