tandor moved to shared DB
This commit is contained in:
+5
-102
@@ -38,7 +38,7 @@ spec:
|
|||||||
- |
|
- |
|
||||||
. /opt/recipes/venv/bin/activate
|
. /opt/recipes/venv/bin/activate
|
||||||
echo "Waiting for database..."
|
echo "Waiting for database..."
|
||||||
while ! python -c "import socket; socket.create_connection(('tandoor-postgres', 5432), timeout=5)" 2>/dev/null; do
|
while ! python -c "import socket; socket.create_connection(('postgresql-rw.database-system.svc.cluster.local', 5432), timeout=5)" 2>/dev/null; do
|
||||||
sleep 2
|
sleep 2
|
||||||
done
|
done
|
||||||
echo "Database is ready. Running migrations..."
|
echo "Database is ready. Running migrations..."
|
||||||
@@ -67,8 +67,9 @@ spec:
|
|||||||
env:
|
env:
|
||||||
- name: DB_ENGINE
|
- name: DB_ENGINE
|
||||||
value: django.db.backends.postgresql
|
value: django.db.backends.postgresql
|
||||||
|
# Database - using shared PostgreSQL in database-system namespace
|
||||||
- name: POSTGRES_HOST
|
- name: POSTGRES_HOST
|
||||||
value: tandoor-postgres
|
value: postgresql-rw.database-system.svc.cluster.local
|
||||||
- name: POSTGRES_PORT
|
- name: POSTGRES_PORT
|
||||||
value: "5432"
|
value: "5432"
|
||||||
- name: POSTGRES_DB
|
- name: POSTGRES_DB
|
||||||
@@ -120,8 +121,9 @@ spec:
|
|||||||
value: "HTTP_X_FORWARDED_PROTO,https"
|
value: "HTTP_X_FORWARDED_PROTO,https"
|
||||||
- name: DB_ENGINE
|
- name: DB_ENGINE
|
||||||
value: django.db.backends.postgresql
|
value: django.db.backends.postgresql
|
||||||
|
# Database - using shared PostgreSQL in database-system namespace
|
||||||
- name: POSTGRES_HOST
|
- name: POSTGRES_HOST
|
||||||
value: tandoor-postgres
|
value: postgresql-rw.database-system.svc.cluster.local
|
||||||
- name: POSTGRES_PORT
|
- name: POSTGRES_PORT
|
||||||
value: "5432"
|
value: "5432"
|
||||||
- name: POSTGRES_DB
|
- name: POSTGRES_DB
|
||||||
@@ -194,69 +196,6 @@ spec:
|
|||||||
path: /mnt/4_hdd/data/tandoor/mediafiles
|
path: /mnt/4_hdd/data/tandoor/mediafiles
|
||||||
type: DirectoryOrCreate
|
type: DirectoryOrCreate
|
||||||
---
|
---
|
||||||
apiVersion: apps/v1
|
|
||||||
kind: Deployment
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app.kubernetes.io/instance: tandoor
|
|
||||||
app.kubernetes.io/name: postgres
|
|
||||||
name: tandoor-postgres
|
|
||||||
namespace: tandoor-system
|
|
||||||
spec:
|
|
||||||
replicas: 1
|
|
||||||
selector:
|
|
||||||
matchLabels:
|
|
||||||
app.kubernetes.io/instance: tandoor
|
|
||||||
app.kubernetes.io/name: postgres
|
|
||||||
strategy:
|
|
||||||
type: Recreate
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app.kubernetes.io/instance: tandoor
|
|
||||||
app.kubernetes.io/name: postgres
|
|
||||||
spec:
|
|
||||||
containers:
|
|
||||||
- name: postgres
|
|
||||||
image: postgres:16-alpine
|
|
||||||
imagePullPolicy: IfNotPresent
|
|
||||||
env:
|
|
||||||
- name: POSTGRES_USER
|
|
||||||
valueFrom:
|
|
||||||
secretKeyRef:
|
|
||||||
name: tandoor-db
|
|
||||||
key: username
|
|
||||||
- name: POSTGRES_PASSWORD
|
|
||||||
valueFrom:
|
|
||||||
secretKeyRef:
|
|
||||||
name: tandoor-db
|
|
||||||
key: password
|
|
||||||
- name: POSTGRES_DB
|
|
||||||
value: tandoor
|
|
||||||
- name: PGDATA
|
|
||||||
value: /var/lib/postgresql/data/pgdata
|
|
||||||
ports:
|
|
||||||
- containerPort: 5432
|
|
||||||
name: postgres
|
|
||||||
protocol: TCP
|
|
||||||
resources:
|
|
||||||
limits:
|
|
||||||
cpu: 500m
|
|
||||||
memory: 512Mi
|
|
||||||
requests:
|
|
||||||
cpu: 100m
|
|
||||||
memory: 128Mi
|
|
||||||
volumeMounts:
|
|
||||||
- name: data
|
|
||||||
mountPath: /var/lib/postgresql/data
|
|
||||||
subPath: data
|
|
||||||
securityContext:
|
|
||||||
fsGroup: 999
|
|
||||||
volumes:
|
|
||||||
- name: data
|
|
||||||
persistentVolumeClaim:
|
|
||||||
claimName: tandoor-postgres
|
|
||||||
---
|
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: Service
|
kind: Service
|
||||||
metadata:
|
metadata:
|
||||||
@@ -277,25 +216,6 @@ spec:
|
|||||||
app.kubernetes.io/instance: tandoor
|
app.kubernetes.io/instance: tandoor
|
||||||
app.kubernetes.io/name: tandoor
|
app.kubernetes.io/name: tandoor
|
||||||
---
|
---
|
||||||
apiVersion: v1
|
|
||||||
kind: Service
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app.kubernetes.io/instance: tandoor
|
|
||||||
app.kubernetes.io/name: postgres
|
|
||||||
name: tandoor-postgres
|
|
||||||
namespace: tandoor-system
|
|
||||||
spec:
|
|
||||||
type: ClusterIP
|
|
||||||
ports:
|
|
||||||
- name: postgres
|
|
||||||
port: 5432
|
|
||||||
protocol: TCP
|
|
||||||
targetPort: postgres
|
|
||||||
selector:
|
|
||||||
app.kubernetes.io/instance: tandoor
|
|
||||||
app.kubernetes.io/name: postgres
|
|
||||||
---
|
|
||||||
apiVersion: networking.k8s.io/v1
|
apiVersion: networking.k8s.io/v1
|
||||||
kind: Ingress
|
kind: Ingress
|
||||||
metadata:
|
metadata:
|
||||||
@@ -352,20 +272,3 @@ spec:
|
|||||||
requests:
|
requests:
|
||||||
storage: 1Gi
|
storage: 1Gi
|
||||||
storageClassName: longhorn
|
storageClassName: longhorn
|
||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: PersistentVolumeClaim
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app.kubernetes.io/instance: tandoor
|
|
||||||
app.kubernetes.io/name: postgres
|
|
||||||
name: tandoor-postgres
|
|
||||||
namespace: tandoor-system
|
|
||||||
spec:
|
|
||||||
accessModes:
|
|
||||||
- ReadWriteOnce
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
storage: 5Gi
|
|
||||||
storageClassName: longhorn
|
|
||||||
---
|
|
||||||
|
|||||||
Reference in New Issue
Block a user