From 0ec8c304b4b75a80c22f26f14acc6ed076435b73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=A1=D0=BE?= =?UTF-8?q?=D0=BB=D0=BE=D0=B2=D1=8C=D0=B5=D0=B2?= Date: Mon, 1 Jun 2026 09:54:23 +0300 Subject: [PATCH] fix(config): restore parametric datasource URLs after merge from dev Dev branch had changed datasource URLs to env vars (SPRING_DATASOURCE_URL etc.) for k8s deployments, but route-processing uses parametric config-server URLs for local development. Co-Authored-By: Claude Sonnet 4.6 --- config-repo/pcp-ballistics-service.yaml | 6 +++--- config-repo/pcp-complex-mission-service.yaml | 6 +++--- config-repo/pcp-mission-planing-service.yaml | 8 ++++---- config-repo/pcp-request-service.yaml | 6 +++--- config-repo/pcp-satellite-catalog-service.yaml | 6 +++--- config-repo/pcp-stations-service.yaml | 6 +++--- config-repo/slots-service.yaml | 6 +++--- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/config-repo/pcp-ballistics-service.yaml b/config-repo/pcp-ballistics-service.yaml index 2be7d2f..2078a67 100644 --- a/config-repo/pcp-ballistics-service.yaml +++ b/config-repo/pcp-ballistics-service.yaml @@ -49,9 +49,9 @@ spring: default-topic: pcp.tle datasource: driver-class-name: org.postgresql.Driver - url: "${SPRING_DATASOURCE_URL}" - username: "${SPRING_DATASOURCE_USERNAME}" - password: "${SPRING_DATASOURCE_PASSWORD}" + url: jdbc:postgresql://${pcp.infra.postgres.host}:${pcp.infra.postgres.port}/pcp_ballistics + username: postgres + password: password # url: jdbc:postgresql://${pcp.infra.postgres.host}:${pcp.infra.postgres.port}/pcp_ballistics # username: postgres # password: password diff --git a/config-repo/pcp-complex-mission-service.yaml b/config-repo/pcp-complex-mission-service.yaml index 65d94fa..f69530e 100644 --- a/config-repo/pcp-complex-mission-service.yaml +++ b/config-repo/pcp-complex-mission-service.yaml @@ -96,9 +96,9 @@ spring: on-profile: dev datasource: driver-class-name: org.postgresql.Driver - url: "${SPRING_DATASOURCE_URL}" - username: "${SPRING_DATASOURCE_USERNAME}" - password: "${SPRING_DATASOURCE_PASSWORD}" + url: jdbc:postgresql://${pcp.infra.postgres.host}:${pcp.infra.postgres.port}/pcp_satellites + username: postgres + password: password jpa: hibernate: ddl-auto: validate diff --git a/config-repo/pcp-mission-planing-service.yaml b/config-repo/pcp-mission-planing-service.yaml index b3c6805..b4e3866 100644 --- a/config-repo/pcp-mission-planing-service.yaml +++ b/config-repo/pcp-mission-planing-service.yaml @@ -75,7 +75,7 @@ spring: camunda: client: mode: self-managed - grpc-address: http://camunda.k8s.265.nstart.cloud:30901 + grpc-address: ${CAMUNDA_GRPC_ADDRESS:http://192.168.60.201:26500} auth: method: none prefer-rest-over-grpc: false @@ -115,9 +115,9 @@ spring: missing-topics-fatal: false datasource: driver-class-name: org.postgresql.Driver - url: "${SPRING_DATASOURCE_URL}" - username: "${SPRING_DATASOURCE_USERNAME}" - password: "${SPRING_DATASOURCE_PASSWORD}" + url: jdbc:postgresql://${pcp.infra.postgres.host}:${pcp.infra.postgres.port}/pcp_missions + username: postgres + password: password jpa: hibernate: ddl-auto: validate diff --git a/config-repo/pcp-request-service.yaml b/config-repo/pcp-request-service.yaml index a176980..ef094a1 100644 --- a/config-repo/pcp-request-service.yaml +++ b/config-repo/pcp-request-service.yaml @@ -17,9 +17,9 @@ spring: management-base-url: ${pcp.services.request} datasource: driver-class-name: org.postgresql.Driver - url: "${SPRING_DATASOURCE_URL}" - username: "${SPRING_DATASOURCE_USERNAME}" - password: "${SPRING_DATASOURCE_PASSWORD}" + url: jdbc:postgresql://${pcp.infra.postgres.host}:${pcp.infra.postgres.port}/pcp_requests + username: postgres + password: password jpa: hibernate: ddl-auto: validate diff --git a/config-repo/pcp-satellite-catalog-service.yaml b/config-repo/pcp-satellite-catalog-service.yaml index da9b1f7..b6aa6dd 100644 --- a/config-repo/pcp-satellite-catalog-service.yaml +++ b/config-repo/pcp-satellite-catalog-service.yaml @@ -80,9 +80,9 @@ spring: default-topic: pcp.tle datasource: driver-class-name: org.postgresql.Driver - url: "${SPRING_DATASOURCE_URL}" - username: "${SPRING_DATASOURCE_USERNAME}" - password: "${SPRING_DATASOURCE_PASSWORD}" + url: jdbc:postgresql://${pcp.infra.postgres.host}:${pcp.infra.postgres.port}/pcp_satellite_catalog + username: postgres + password: password jpa: hibernate: ddl-auto: validate diff --git a/config-repo/pcp-stations-service.yaml b/config-repo/pcp-stations-service.yaml index e3184ca..3dbc099 100644 --- a/config-repo/pcp-stations-service.yaml +++ b/config-repo/pcp-stations-service.yaml @@ -68,9 +68,9 @@ spring: on-profile: dev datasource: driver-class-name: org.postgresql.Driver - url: "${SPRING_DATASOURCE_URL}" - username: "${SPRING_DATASOURCE_USERNAME}" - password: "${SPRING_DATASOURCE_PASSWORD}" + url: jdbc:postgresql://${pcp.infra.postgres.host}:${pcp.infra.postgres.port}/pcp_stations + username: postgres + password: password jpa: hibernate: ddl-auto: validate diff --git a/config-repo/slots-service.yaml b/config-repo/slots-service.yaml index 8021e3f..cf2debc 100644 --- a/config-repo/slots-service.yaml +++ b/config-repo/slots-service.yaml @@ -108,9 +108,9 @@ spring: default-topic: pcp.tle datasource: driver-class-name: org.postgresql.Driver - url: "${SPRING_DATASOURCE_URL}" - username: "${SPRING_DATASOURCE_USERNAME}" - password: "${SPRING_DATASOURCE_PASSWORD}" + url: jdbc:postgresql://${pcp.infra.postgres.host}:${pcp.infra.postgres.port}/pcp_slots + username: postgres + password: password jpa: hibernate: ddl-auto: validate