8 files changed, 31 insertions, 13 deletions

diff --git a/kubernetes/namespaces/default/postgresql/README.md b/kubernetes/namespaces/databases/postgresql/README.md
index 07eed4f..07eed4f 100644
--- a/kubernetes/namespaces/default/postgresql/README.md
+++ b/kubernetes/namespaces/databases/postgresql/README.md
diff --git a/kubernetes/namespaces/default/postgresql/configmap.yaml b/kubernetes/namespaces/databases/postgresql/configmap.yaml
index a2c9a4e..12ad19b 100644
--- a/kubernetes/namespaces/default/postgresql/configmap.yaml
+++ b/kubernetes/namespaces/databases/postgresql/configmap.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: postgres-config
+  namespace: databases
 data:
   postgresql.conf: |
     # From pgtune
diff --git a/kubernetes/namespaces/default/postgresql/deployment.yaml b/kubernetes/namespaces/databases/postgresql/deployment.yaml
index cfe6101..bf1f246 100644
--- a/kubernetes/namespaces/default/postgresql/deployment.yaml
+++ b/kubernetes/namespaces/databases/postgresql/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: postgres
+  namespace: databases
 spec:
   replicas: 1
   strategy:
@@ -16,7 +17,7 @@ spec:
     spec:
       containers:
         - name: postgres
-          image: ghcr.io/chrislovering/psql_extended:15
+          image: ghcr.io/owl-corp/psql_extended:16
           imagePullPolicy: "Always"
           ports:
             - name: postgres
diff --git a/kubernetes/namespaces/databases/postgresql/secrets.yaml b/kubernetes/namespaces/databases/postgresql/secrets.yaml
new file mode 100644
index 0000000..68c225e
--- /dev/null
+++ b/kubernetes/namespaces/databases/postgresql/secrets.yaml
diff --git a/kubernetes/namespaces/databases/postgresql/service.yaml b/kubernetes/namespaces/databases/postgresql/service.yaml
new file mode 100644
index 0000000..6a2b520
--- /dev/null
+++ b/kubernetes/namespaces/databases/postgresql/service.yaml
@@ -0,0 +1,26 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: postgres
+  name: postgres
+  namespace: databases
+spec:
+  ports:
+    - port: 5432
+  selector:
+    app: postgres
+---
+# Fallback service for items relying on svc/postgres in the default namespace
+apiVersion: v1
+kind: Service
+metadata:
+  name: postgres
+  namespace: default
+spec:
+  type: ExternalName
+  externalName: postgres.databases.svc.cluster.local
+  ports:
+    - port: 5432
+  selector:
+    app: postgres
diff --git a/kubernetes/namespaces/default/postgresql/volume.yaml b/kubernetes/namespaces/databases/postgresql/volume.yaml
index 53108ce..ed1d2d6 100644
--- a/kubernetes/namespaces/default/postgresql/volume.yaml
+++ b/kubernetes/namespaces/databases/postgresql/volume.yaml
@@ -4,10 +4,11 @@ metadata:
   name: postgres-storage
   labels:
     app: postgres
+  namespace: databases
 spec:
   storageClassName: linode-block-storage-retain
   accessModes:
-    - ReadWriteOnce
+    - ReadWriteOncePod
   resources:
     requests:
       storage: 25Gi
diff --git a/kubernetes/namespaces/default/postgresql/secrets.yaml b/kubernetes/namespaces/default/postgresql/secrets.yaml
deleted file mode 100644
index 902f7d5..0000000
--- a/kubernetes/namespaces/default/postgresql/secrets.yaml
+++ /dev/null
diff --git a/kubernetes/namespaces/default/postgresql/service.yaml b/kubernetes/namespaces/default/postgresql/service.yaml
deleted file mode 100644
index f69deae..0000000
--- a/kubernetes/namespaces/default/postgresql/service.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app: postgres
-  name: postgres
-spec:
-  ports:
-    - port: 5432
-  selector:
-    app: postgres