37 files changed, 14 insertions, 1 deletions
diff --git a/kubernetes/namespaces/default/black-knight/README.md b/kubernetes/namespaces/bots/black-knight/README.md
index d1f8d89..d1f8d89 100644
--- a/kubernetes/namespaces/default/black-knight/README.md
+++ b/kubernetes/namespaces/bots/black-knight/README.md
diff --git a/kubernetes/namespaces/default/black-knight/deployment.yaml b/kubernetes/namespaces/bots/black-knight/deployment.yaml
index e10e32c..9d27e07 100644
--- a/kubernetes/namespaces/default/black-knight/deployment.yaml
+++ b/kubernetes/namespaces/bots/black-knight/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: black-knight
+  namespace: bots
 spec:
   replicas: 1
   selector:
diff --git a/kubernetes/namespaces/bots/black-knight/secrets.yaml b/kubernetes/namespaces/bots/black-knight/secrets.yaml
new file mode 100644
index 0000000..6b8ef8f
--- /dev/null
+++ b/kubernetes/namespaces/bots/black-knight/secrets.yaml
diff --git a/kubernetes/namespaces/default/bot/README.md b/kubernetes/namespaces/bots/bot/README.md
index 565cf70..565cf70 100644
--- a/kubernetes/namespaces/default/bot/README.md
+++ b/kubernetes/namespaces/bots/bot/README.md
diff --git a/kubernetes/namespaces/default/bot/configmap.yaml b/kubernetes/namespaces/bots/bot/configmap.yaml
index f6bf02e..8e04e35 100644
--- a/kubernetes/namespaces/default/bot/configmap.yaml
+++ b/kubernetes/namespaces/bots/bot/configmap.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: bot-config-env
+  namespace: bots
 data:
   BOT_TRACE_LOGGERS: bot.utils.scheduling.ModPingsOnOff,bot.exts.moderation.modpings,bot.exts.backend.sync._syncers
   DEBUG: 'False'
diff --git a/kubernetes/namespaces/default/bot/deployment.yaml b/kubernetes/namespaces/bots/bot/deployment.yaml
index 8f274f7..033c2b9 100644
--- a/kubernetes/namespaces/default/bot/deployment.yaml
+++ b/kubernetes/namespaces/bots/bot/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: bot
+  namespace: bots
 spec:
   replicas: 1
   selector:
diff --git a/kubernetes/namespaces/bots/bot/secrets.yaml b/kubernetes/namespaces/bots/bot/secrets.yaml
new file mode 100644
index 0000000..156c55a
--- /dev/null
+++ b/kubernetes/namespaces/bots/bot/secrets.yaml
diff --git a/kubernetes/namespaces/default/king-arthur/README.md b/kubernetes/namespaces/bots/king-arthur/README.md
index 704d45b..704d45b 100644
--- a/kubernetes/namespaces/default/king-arthur/README.md
+++ b/kubernetes/namespaces/bots/king-arthur/README.md
diff --git a/kubernetes/namespaces/default/king-arthur/deployment.yaml b/kubernetes/namespaces/bots/king-arthur/deployment.yaml
index c8da1c0..b5250ba 100644
--- a/kubernetes/namespaces/default/king-arthur/deployment.yaml
+++ b/kubernetes/namespaces/bots/king-arthur/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: king-arthur
+  namespace: bots
 spec:
   replicas: 1
   selector:
diff --git a/kubernetes/namespaces/bots/king-arthur/secrets.yaml b/kubernetes/namespaces/bots/king-arthur/secrets.yaml
new file mode 100644
index 0000000..dda3686
--- /dev/null
+++ b/kubernetes/namespaces/bots/king-arthur/secrets.yaml
diff --git a/kubernetes/namespaces/default/king-arthur/service-account.yaml b/kubernetes/namespaces/bots/king-arthur/service-account.yaml
index a63a88e..c971205 100644
--- a/kubernetes/namespaces/default/king-arthur/service-account.yaml
+++ b/kubernetes/namespaces/bots/king-arthur/service-account.yaml
@@ -12,6 +12,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: king-arthur
+  namespace: bots
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -24,4 +25,4 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: king-arthur
-    namespace: default
+    namespace: bots
diff --git a/kubernetes/namespaces/default/metricity/README.md b/kubernetes/namespaces/bots/metricity/README.md
index 30c8b95..30c8b95 100644
--- a/kubernetes/namespaces/default/metricity/README.md
+++ b/kubernetes/namespaces/bots/metricity/README.md
diff --git a/kubernetes/namespaces/bots/metricity/secrets.yaml b/kubernetes/namespaces/bots/metricity/secrets.yaml
new file mode 100644
index 0000000..a4a11b5
--- /dev/null
+++ b/kubernetes/namespaces/bots/metricity/secrets.yaml
diff --git a/kubernetes/namespaces/default/sir-lancebot/README.md b/kubernetes/namespaces/bots/sir-lancebot/README.md
index 293a955..293a955 100644
--- a/kubernetes/namespaces/default/sir-lancebot/README.md
+++ b/kubernetes/namespaces/bots/sir-lancebot/README.md
diff --git a/kubernetes/namespaces/default/sir-lancebot/deployment.yaml b/kubernetes/namespaces/bots/sir-lancebot/deployment.yaml
index fdba4a6..981107c 100644
--- a/kubernetes/namespaces/default/sir-lancebot/deployment.yaml
+++ b/kubernetes/namespaces/bots/sir-lancebot/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: sir-lancebot
+  namespace: bots
 spec:
   replicas: 1
   selector:
diff --git a/kubernetes/namespaces/bots/sir-lancebot/secrets.yaml b/kubernetes/namespaces/bots/sir-lancebot/secrets.yaml
new file mode 100644
index 0000000..9ba6a98
--- /dev/null
+++ b/kubernetes/namespaces/bots/sir-lancebot/secrets.yaml
diff --git a/kubernetes/namespaces/default/sir-robin/README.md b/kubernetes/namespaces/bots/sir-robin/README.md
index 0521359..0521359 100644
--- a/kubernetes/namespaces/default/sir-robin/README.md
+++ b/kubernetes/namespaces/bots/sir-robin/README.md
diff --git a/kubernetes/namespaces/default/sir-robin/configmap.yaml b/kubernetes/namespaces/bots/sir-robin/configmap.yaml
index ec13a93..33b58a3 100644
--- a/kubernetes/namespaces/default/sir-robin/configmap.yaml
+++ b/kubernetes/namespaces/bots/sir-robin/configmap.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: sir-robin-config-env
+  namespace: bots
 data:
   AOC_YEAR: '2023'
   BOT_DEBUG: 'False'
diff --git a/kubernetes/namespaces/default/sir-robin/deployment.yaml b/kubernetes/namespaces/bots/sir-robin/deployment.yaml
index 9fbf0a1..1ffda36 100644
--- a/kubernetes/namespaces/default/sir-robin/deployment.yaml
+++ b/kubernetes/namespaces/bots/sir-robin/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: sir-robin
+  namespace: bots
 spec:
   replicas: 1
   selector:
diff --git a/kubernetes/namespaces/bots/sir-robin/secrets.yaml b/kubernetes/namespaces/bots/sir-robin/secrets.yaml
new file mode 100644
index 0000000..ade44c0
--- /dev/null
+++ b/kubernetes/namespaces/bots/sir-robin/secrets.yaml
diff --git a/kubernetes/namespaces/default/black-knight/secrets.yaml b/kubernetes/namespaces/default/black-knight/secrets.yaml
deleted file mode 100644
index 40909c9..0000000
--- a/kubernetes/namespaces/default/black-knight/secrets.yaml
+++ /dev/null
diff --git a/kubernetes/namespaces/default/bot/secrets.yaml b/kubernetes/namespaces/default/bot/secrets.yaml
deleted file mode 100644
index 339d44a..0000000
--- a/kubernetes/namespaces/default/bot/secrets.yaml
+++ /dev/null
diff --git a/kubernetes/namespaces/default/king-arthur/secrets.yaml b/kubernetes/namespaces/default/king-arthur/secrets.yaml
deleted file mode 100644
index dc52d2e..0000000
--- a/kubernetes/namespaces/default/king-arthur/secrets.yaml
+++ /dev/null
diff --git a/kubernetes/namespaces/default/metricity/secrets.yaml b/kubernetes/namespaces/default/metricity/secrets.yaml
deleted file mode 100644
index 0a217bf..0000000
--- a/kubernetes/namespaces/default/metricity/secrets.yaml
+++ /dev/null
diff --git a/kubernetes/namespaces/default/modmail/secrets.yaml b/kubernetes/namespaces/default/modmail/secrets.yaml
deleted file mode 100644
index 5fda68c..0000000
--- a/kubernetes/namespaces/default/modmail/secrets.yaml
+++ /dev/null
diff --git a/kubernetes/namespaces/default/redis/secrets.yaml b/kubernetes/namespaces/default/redis/secrets.yaml
index 29e4c15..8e29358 100644
--- a/kubernetes/namespaces/default/redis/secrets.yaml
+++ b/kubernetes/namespaces/default/redis/secrets.yaml
diff --git a/kubernetes/namespaces/default/sir-lancebot/secrets.yaml b/kubernetes/namespaces/default/sir-lancebot/secrets.yaml
deleted file mode 100644
index f6b0591..0000000
--- a/kubernetes/namespaces/default/sir-lancebot/secrets.yaml
+++ /dev/null
diff --git a/kubernetes/namespaces/default/sir-robin/secrets.yaml b/kubernetes/namespaces/default/sir-robin/secrets.yaml
deleted file mode 100644
index 158ff5d..0000000
--- a/kubernetes/namespaces/default/sir-robin/secrets.yaml
+++ /dev/null
diff --git a/kubernetes/namespaces/default/modmail/README.md b/kubernetes/namespaces/modmail/README.md
index b78857b..b78857b 100644
--- a/kubernetes/namespaces/default/modmail/README.md
+++ b/kubernetes/namespaces/modmail/README.md
diff --git a/kubernetes/namespaces/default/modmail/bot/README.md b/kubernetes/namespaces/modmail/bot/README.md
index ac29ac2..ac29ac2 100644
--- a/kubernetes/namespaces/default/modmail/bot/README.md
+++ b/kubernetes/namespaces/modmail/bot/README.md
diff --git a/kubernetes/namespaces/default/modmail/bot/deployment.yaml b/kubernetes/namespaces/modmail/bot/deployment.yaml
index b54fd2a..6084927 100644
--- a/kubernetes/namespaces/default/modmail/bot/deployment.yaml
+++ b/kubernetes/namespaces/modmail/bot/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: modmail-bot
+  namespace: modmail
 spec:
   replicas: 1
   selector:
diff --git a/kubernetes/namespaces/default/modmail/configmap.yaml b/kubernetes/namespaces/modmail/configmap.yaml
index 30e417a..9117464 100644
--- a/kubernetes/namespaces/default/modmail/configmap.yaml
+++ b/kubernetes/namespaces/modmail/configmap.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: modmail-config-env
+  namespace: modmail
 data:
   DATABASE_TYPE: 'mongodb'  # The type of database to use, only supports mongodb right now
   DATA_COLLECTION: 'false'  # Disable bot metadata collection by modmail devs
diff --git a/kubernetes/namespaces/modmail/secrets.yaml b/kubernetes/namespaces/modmail/secrets.yaml
new file mode 100644
index 0000000..c376565
--- /dev/null
+++ b/kubernetes/namespaces/modmail/secrets.yaml
diff --git a/kubernetes/namespaces/default/modmail/web/README.md b/kubernetes/namespaces/modmail/web/README.md
index 7b7e19e..7b7e19e 100644
--- a/kubernetes/namespaces/default/modmail/web/README.md
+++ b/kubernetes/namespaces/modmail/web/README.md
diff --git a/kubernetes/namespaces/default/modmail/web/deployment.yaml b/kubernetes/namespaces/modmail/web/deployment.yaml
index 74ae535..877e945 100644
--- a/kubernetes/namespaces/default/modmail/web/deployment.yaml
+++ b/kubernetes/namespaces/modmail/web/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: modmail-web
+  namespace: modmail
 spec:
   replicas: 1
   selector:
diff --git a/kubernetes/namespaces/default/modmail/web/ingress.yaml b/kubernetes/namespaces/modmail/web/ingress.yaml
index a5990cf..b610b09 100644
--- a/kubernetes/namespaces/default/modmail/web/ingress.yaml
+++ b/kubernetes/namespaces/modmail/web/ingress.yaml
@@ -6,6 +6,7 @@ metadata:
     nginx.ingress.kubernetes.io/auth-tls-secret: "kube-system/mtls-client-crt-bundle"
     nginx.ingress.kubernetes.io/auth-tls-error-page: "https://www.youtube.com/watch?v=dQw4w9WgXcQ"
   name: modmail-web
+  namespace: modmail
 spec:
   tls:
   - hosts:
diff --git a/kubernetes/namespaces/default/modmail/web/service.yaml b/kubernetes/namespaces/modmail/web/service.yaml
index 384e638..2ea2e7d 100644
--- a/kubernetes/namespaces/default/modmail/web/service.yaml
+++ b/kubernetes/namespaces/modmail/web/service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: modmail-web
+  namespace: modmail
 spec:
   selector:
     app: modmail-web