From df40cdd016ff28b888c9c29274a71ef94e6fd0c0 Mon Sep 17 00:00:00 2001
From: Joseph Hanson <joe@veri.dev>
Date: Wed, 1 Nov 2023 16:08:27 -0500
Subject: [PATCH] Moving Redis to the fediverse.

---
 kubernetes/apps/database/kustomization.yaml               | 1 -
 kubernetes/apps/fediverse/kustomization.yaml              | 1 +
 kubernetes/apps/{database => fediverse}/redis/ks.yaml     | 6 ++----
 .../app => fediverse/redis/peertube}/helmrelease.yaml     | 8 ++++----
 .../app => fediverse/redis/peertube}/kustomization.yaml   | 2 +-
 5 files changed, 8 insertions(+), 10 deletions(-)
 rename kubernetes/apps/{database => fediverse}/redis/ks.yaml (71%)
 rename kubernetes/apps/{database/redis/app => fediverse/redis/peertube}/helmrelease.yaml (91%)
 rename kubernetes/apps/{database/redis/app => fediverse/redis/peertube}/kustomization.yaml (89%)

diff --git a/kubernetes/apps/database/kustomization.yaml b/kubernetes/apps/database/kustomization.yaml
index dd8a772..77faf48 100644
--- a/kubernetes/apps/database/kustomization.yaml
+++ b/kubernetes/apps/database/kustomization.yaml
@@ -7,4 +7,3 @@ resources:
   - ./namespace.yaml
   # Flux-Kustomizations
   - ./crunchy-postgres/ks.yaml
-  - ./redis/ks.yaml
diff --git a/kubernetes/apps/fediverse/kustomization.yaml b/kubernetes/apps/fediverse/kustomization.yaml
index 2239efe..cad87af 100644
--- a/kubernetes/apps/fediverse/kustomization.yaml
+++ b/kubernetes/apps/fediverse/kustomization.yaml
@@ -7,3 +7,4 @@ resources:
   - ./namespace.yaml
   # Flux-Kustomizations
   - ./peertube/ks.yaml
+  - ./redis/ks.yaml
diff --git a/kubernetes/apps/database/redis/ks.yaml b/kubernetes/apps/fediverse/redis/ks.yaml
similarity index 71%
rename from kubernetes/apps/database/redis/ks.yaml
rename to kubernetes/apps/fediverse/redis/ks.yaml
index 23da03c..a4078a1 100644
--- a/kubernetes/apps/database/redis/ks.yaml
+++ b/kubernetes/apps/fediverse/redis/ks.yaml
@@ -3,12 +3,10 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: cluster-apps-redis
+  name: cluster-apps-redis-peertube
   namespace: flux-system
 spec:
-  dependsOn:
-    - name: cluster-apps-external-secrets-stores
-  path: ./kubernetes/apps/database/redis/app
+  path: ./kubernetes/apps/database/redis/peertube
   prune: true
   sourceRef:
     kind: GitRepository
diff --git a/kubernetes/apps/database/redis/app/helmrelease.yaml b/kubernetes/apps/fediverse/redis/peertube/helmrelease.yaml
similarity index 91%
rename from kubernetes/apps/database/redis/app/helmrelease.yaml
rename to kubernetes/apps/fediverse/redis/peertube/helmrelease.yaml
index 37fa4da..b818174 100644
--- a/kubernetes/apps/database/redis/app/helmrelease.yaml
+++ b/kubernetes/apps/fediverse/redis/peertube/helmrelease.yaml
@@ -3,8 +3,8 @@
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
-  name: redis
-  namespace: database
+  name: redis-peertube
+  namespace: fediverse
 spec:
   interval: 30m
   timeout: 15m
@@ -32,10 +32,10 @@ spec:
       sentinel: false
     master:
       persistence:
-        enabled: false
+        enabled: true
     replica:
       persistence:
-        enabled: false
+        enabled: true
     sentinel:
       enabled: true
       masterSet: redis-master
diff --git a/kubernetes/apps/database/redis/app/kustomization.yaml b/kubernetes/apps/fediverse/redis/peertube/kustomization.yaml
similarity index 89%
rename from kubernetes/apps/database/redis/app/kustomization.yaml
rename to kubernetes/apps/fediverse/redis/peertube/kustomization.yaml
index e6b86c5..92d7902 100644
--- a/kubernetes/apps/database/redis/app/kustomization.yaml
+++ b/kubernetes/apps/fediverse/redis/peertube/kustomization.yaml
@@ -2,6 +2,6 @@
 # yaml-language-server: $schema=https://json.schemastore.org/kustomization
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: database
+namespace: fediverse
 resources:
   - ./helmrelease.yaml