From 990a6fe9181b3addd287f990bce7124514e7c41e Mon Sep 17 00:00:00 2001 From: vigdorov Date: Sun, 8 Feb 2026 01:53:04 +0300 Subject: [PATCH] change db --- backend/.env.example | 6 +-- docker-compose.yml | 26 +++---------- k8s/backend-deployment.yaml | 2 +- k8s/postgres-pvc.yaml | 11 ------ k8s/postgres-statefulset.yaml | 71 ----------------------------------- 5 files changed, 10 insertions(+), 106 deletions(-) delete mode 100644 k8s/postgres-pvc.yaml delete mode 100644 k8s/postgres-statefulset.yaml diff --git a/backend/.env.example b/backend/.env.example index 6b20b05..3d5d6cc 100644 --- a/backend/.env.example +++ b/backend/.env.example @@ -1,6 +1,6 @@ -# Database -DB_HOST=localhost -DB_PORT=5432 +# Database (Shared dev instance on server) +DB_HOST=10.10.10.100 +DB_PORT=30432 DB_USERNAME=teamplanner DB_PASSWORD=teamplanner DB_DATABASE=teamplanner diff --git a/docker-compose.yml b/docker-compose.yml index f35acbc..f83eef2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,22 +1,8 @@ version: '3.8' -services: - postgres: - image: postgres:16-alpine - container_name: team-planner-db - environment: - POSTGRES_USER: teamplanner - POSTGRES_PASSWORD: teamplanner - POSTGRES_DB: teamplanner - ports: - - "5432:5432" - volumes: - - postgres_data:/var/lib/postgresql/data - healthcheck: - test: ["CMD-SHELL", "pg_isready -U teamplanner"] - interval: 5s - timeout: 5s - retries: 5 - -volumes: - postgres_data: +# PostgreSQL предоставляется shared dev-инстансом на сервере (10.10.10.100:30432) +# Для подключения используйте переменные из .env: +# DB_HOST=10.10.10.100 +# DB_PORT=30432 +# +# Этот файл оставлен для возможного добавления других локальных сервисов. diff --git a/k8s/backend-deployment.yaml b/k8s/backend-deployment.yaml index 1f004a6..21b4cb2 100644 --- a/k8s/backend-deployment.yaml +++ b/k8s/backend-deployment.yaml @@ -25,7 +25,7 @@ spec: - name: PORT value: "4001" - name: DB_HOST - value: "postgres-service" + value: "shared-postgres-service.shared-db.svc.cluster.local" - name: DB_PORT value: "5432" - name: DB_DATABASE diff --git a/k8s/postgres-pvc.yaml b/k8s/postgres-pvc.yaml deleted file mode 100644 index ee7aa95..0000000 --- a/k8s/postgres-pvc.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: postgres-pvc -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 10Gi - storageClassName: local-path diff --git a/k8s/postgres-statefulset.yaml b/k8s/postgres-statefulset.yaml deleted file mode 100644 index c25cb52..0000000 --- a/k8s/postgres-statefulset.yaml +++ /dev/null @@ -1,71 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: postgres -spec: - serviceName: postgres-service - replicas: 1 - selector: - matchLabels: - app: postgres - template: - metadata: - labels: - app: postgres - spec: - containers: - - name: postgres - image: postgres:15-alpine - ports: - - containerPort: 5432 - name: postgres - env: - - name: POSTGRES_DB - valueFrom: - secretKeyRef: - name: team-planner-secrets - key: db-name - - name: POSTGRES_USER - valueFrom: - secretKeyRef: - name: team-planner-secrets - key: db-user - - name: POSTGRES_PASSWORD - valueFrom: - secretKeyRef: - name: team-planner-secrets - key: db-password - - name: PGDATA - value: /var/lib/postgresql/data/pgdata - volumeMounts: - - name: postgres-storage - mountPath: /var/lib/postgresql/data - resources: - requests: - memory: "256Mi" - cpu: "250m" - limits: - memory: "512Mi" - cpu: "500m" - livenessProbe: - exec: - command: - - sh - - -c - - 'pg_isready -h 127.0.0.1 -U "$POSTGRES_USER" -d "$POSTGRES_DB"' - initialDelaySeconds: 30 - periodSeconds: 10 - timeoutSeconds: 5 - readinessProbe: - exec: - command: - - sh - - -c - - 'pg_isready -h 127.0.0.1 -U "$POSTGRES_USER" -d "$POSTGRES_DB"' - initialDelaySeconds: 5 - periodSeconds: 5 - timeoutSeconds: 5 - volumes: - - name: postgres-storage - persistentVolumeClaim: - claimName: postgres-pvc