Move Redis to databases namespace

10 files changed, 7 insertions, 13 deletions

diff --git a/kubernetes/namespaces/databases/blackbox/blackbox-configmap.yaml b/kubernetes/namespaces/databases/blackbox/blackbox-configmap.yaml
index 9cdb6ad..2f2f863 100644
--- a/kubernetes/namespaces/databases/blackbox/blackbox-configmap.yaml
+++ b/kubernetes/namespaces/databases/blackbox/blackbox-configmap.yaml
@@ -18,7 +18,7 @@ data:
       redis:
         main_redis:
           password: {{ REDIS_PASSWORD }}
-          host: redis.default.svc.cluster.local
+          host: redis.databases.svc.cluster.local
           port: "6379"
 
     storage:
diff --git a/kubernetes/namespaces/default/redis/README.md b/kubernetes/namespaces/databases/redis/README.md
index d496758..3f50ebd 100644
--- a/kubernetes/namespaces/default/redis/README.md
+++ b/kubernetes/namespaces/databases/redis/README.md
@@ -1,15 +1,6 @@
 # Python Discord Redis
 This folder contains the configuration for Python Discord's Redis instance.
 
-## ConfigMap
-**We'll need to create a ConfigMap for this service, which will hold the `redis.conf` configuration.**
-
-Do the following:
-1. Make a copy of `redis.conf.template` called `redis.conf`
-2. Edit your `redis.conf` to replace `<INSERT PASSWORD>` with the password you'd like your redis instance to use.
-3. Use `kubectl create configmap redis-conf --from-file=redis.conf` to create the ConfigMap
-4. Delete the `redis.conf`. **We don't wanna commit that password anywhere!**
-
 ## Volume
 A 10Gi volume is provisioned on the Linode Block Storage (Retain) storage class.
 
@@ -21,7 +12,7 @@ It will mount the created volume at `/data`.
 It will expose port `6379` to connect to Redis.
 
 ## Service
-A service called `redis` will be created to give the deployment a cluster local DNS record of `redis.default.svc.cluster.local`.
+A service called `redis` will be created to give the deployment a cluster local DNS record of `redis.databases.svc.cluster.local`.
 
 ## Secrets
 
diff --git a/kubernetes/namespaces/default/redis/configmap.yaml b/kubernetes/namespaces/databases/redis/configmap.yaml
index 2a2f23e..340b96b 100644
--- a/kubernetes/namespaces/default/redis/configmap.yaml
+++ b/kubernetes/namespaces/databases/redis/configmap.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: redis-conf
-  namespace: default
+  namespace: databases
 data:
   redis.conf: |
     # Store all commands used and replay on server startup
diff --git a/kubernetes/namespaces/default/redis/deployment.yaml b/kubernetes/namespaces/databases/redis/deployment.yaml
index ef5d68c..6eb88ab 100644
--- a/kubernetes/namespaces/default/redis/deployment.yaml
+++ b/kubernetes/namespaces/databases/redis/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: redis
+  namespace: databases
 spec:
   replicas: 1
   strategy:
diff --git a/kubernetes/namespaces/default/redis/redis.conf.template b/kubernetes/namespaces/databases/redis/redis.conf.template
index 6d8eeac..578af57 100644
--- a/kubernetes/namespaces/default/redis/redis.conf.template
+++ b/kubernetes/namespaces/databases/redis/redis.conf.template
@@ -2,7 +2,7 @@
 appendonly yes
 
 # Set password
-requirepass <INSERT PASSWORD>
+requirepass <INSERT PASS>
 
 # Set working directory
 dir /data
diff --git a/kubernetes/namespaces/databases/redis/secrets.yaml b/kubernetes/namespaces/databases/redis/secrets.yaml
new file mode 100644
index 0000000..e377df1
--- /dev/null
+++ b/kubernetes/namespaces/databases/redis/secrets.yaml
diff --git a/kubernetes/namespaces/default/redis/service.yaml b/kubernetes/namespaces/databases/redis/service.yaml
index 0be72e8..6394b7f 100644
--- a/kubernetes/namespaces/default/redis/service.yaml
+++ b/kubernetes/namespaces/databases/redis/service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: redis
+  namespace: databases
 spec:
   ports:
     - port: 6379  # Redis default port
diff --git a/kubernetes/namespaces/default/redis/volume.yaml b/kubernetes/namespaces/databases/redis/volume.yaml
index 6522ea6..e935c8f 100644
--- a/kubernetes/namespaces/default/redis/volume.yaml
+++ b/kubernetes/namespaces/databases/redis/volume.yaml
@@ -2,6 +2,7 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: redis-storage
+  namespace: databases
   labels:
     app: redis
 spec:
diff --git a/kubernetes/namespaces/default/redis/secrets.yaml b/kubernetes/namespaces/default/redis/secrets.yaml
deleted file mode 100644
index 8e29358..0000000
--- a/kubernetes/namespaces/default/redis/secrets.yaml
+++ /dev/null
diff --git a/kubernetes/namespaces/monitoring/exporters/redis/secrets.yaml b/kubernetes/namespaces/monitoring/exporters/redis/secrets.yaml
index f6ce9d0..7763e19 100644
--- a/kubernetes/namespaces/monitoring/exporters/redis/secrets.yaml
+++ b/kubernetes/namespaces/monitoring/exporters/redis/secrets.yaml