config(dev): datasource из env для всех сервисов; helm-env БД для dynamic-plan и tgu

Откат регрессии 0ec8c30: в профиле dev datasource снова берётся из
SPRING_DATASOURCE_URL/USERNAME/PASSWORD (профиль local оставлен параметрическим).
dynamic-plan и tgu переведены на тот же механизм + добавлены helm extraEnv
с in-cluster postgres и кредами из секретов pcp-dynamic-plan-db / pcp-tgu-db.

config-repo/pcp-ballistics-service.yaml

@@ -49,12 +49,9 @@ spring:
       default-topic: pcp.tle
   datasource:
     driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://${pcp.infra.postgres.host}:${pcp.infra.postgres.port}/pcp_ballistics
+    url: "${SPRING_DATASOURCE_URL}"
-    username: postgres
+    username: "${SPRING_DATASOURCE_USERNAME}"
-    password: password
+    password: "${SPRING_DATASOURCE_PASSWORD}"
-#    url: jdbc:postgresql://${pcp.infra.postgres.host}:${pcp.infra.postgres.port}/pcp_ballistics
-#    username: postgres
-#    password: password
   jpa:
     hibernate:
       ddl-auto: validate

config-repo/pcp-complex-mission-service.yaml

@@ -96,9 +96,9 @@ spring:
       on-profile: dev
   datasource:
     driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://${pcp.infra.postgres.host}:${pcp.infra.postgres.port}/pcp_satellites
+    url: "${SPRING_DATASOURCE_URL}"
-    username: postgres
+    username: "${SPRING_DATASOURCE_USERNAME}"
-    password: password
+    password: "${SPRING_DATASOURCE_PASSWORD}"
   jpa:
     hibernate:
       ddl-auto: validate

config-repo/pcp-dynamic-plan-service.yaml

@@ -88,9 +88,9 @@ spring:
       on-profile: dev
   datasource:
     driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://${pcp.infra.postgres.host}:${pcp.infra.postgres.port}/pcp_complex_plan
+    url: "${SPRING_DATASOURCE_URL}"
-    username: postgres
+    username: "${SPRING_DATASOURCE_USERNAME}"
-    password: password
+    password: "${SPRING_DATASOURCE_PASSWORD}"
   jpa:
     hibernate:
       ddl-auto: validate

config-repo/pcp-mission-planing-service.yaml

@@ -121,9 +121,9 @@ spring:
       missing-topics-fatal: false
   datasource:
     driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://${pcp.infra.postgres.host}:${pcp.infra.postgres.port}/pcp_missions
+    url: "${SPRING_DATASOURCE_URL}"
-    username: postgres
+    username: "${SPRING_DATASOURCE_USERNAME}"
-    password: password
+    password: "${SPRING_DATASOURCE_PASSWORD}"
   jpa:
     hibernate:
       ddl-auto: validate

config-repo/pcp-satellite-catalog-service.yaml

@@ -80,9 +80,9 @@ spring:
       default-topic: pcp.tle
   datasource:
     driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://${pcp.infra.postgres.host}:${pcp.infra.postgres.port}/pcp_satellite_catalog
+    url: "${SPRING_DATASOURCE_URL}"
-    username: postgres
+    username: "${SPRING_DATASOURCE_USERNAME}"
-    password: password
+    password: "${SPRING_DATASOURCE_PASSWORD}"
   jpa:
     hibernate:
       ddl-auto: validate

config-repo/pcp-stations-service.yaml

@@ -68,9 +68,9 @@ spring:
       on-profile: dev
   datasource:
     driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://${pcp.infra.postgres.host}:${pcp.infra.postgres.port}/pcp_stations
+    url: "${SPRING_DATASOURCE_URL}"
-    username: postgres
+    username: "${SPRING_DATASOURCE_USERNAME}"
-    password: password
+    password: "${SPRING_DATASOURCE_PASSWORD}"
   jpa:
     hibernate:
       ddl-auto: validate

config-repo/pcp-tgu-service.yaml

@@ -123,9 +123,9 @@ spring:
       on-profile: dev
   datasource:
     driver-class-name: org.postgresql.Driver
-    url: ${DB_URL:jdbc:postgresql://${pcp.infra.postgres.host}:${pcp.infra.postgres.port}/pcp_tgu}
+    url: "${SPRING_DATASOURCE_URL}"
-    username: ${DB_USERNAME:postgres}
+    username: "${SPRING_DATASOURCE_USERNAME}"
-    password: ${DB_PASSWORD:password}
+    password: "${SPRING_DATASOURCE_PASSWORD}"
   jpa:
     hibernate:
       ddl-auto: validate

config-repo/slots-service.yaml

@@ -108,9 +108,9 @@ spring:
       default-topic: pcp.tle
   datasource:
     driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://${pcp.infra.postgres.host}:${pcp.infra.postgres.port}/pcp_slots
+    url: "${SPRING_DATASOURCE_URL}"
-    username: postgres
+    username: "${SPRING_DATASOURCE_USERNAME}"
-    password: password
+    password: "${SPRING_DATASOURCE_PASSWORD}"
   jpa:
     hibernate:
       ddl-auto: validate

helm/pcp-dynamic-plan-service/values-dev.yaml

@@ -9,3 +9,19 @@ service:
 ingress:
   enabled: true
   host: pcp-dynamic-plan-service.dev.k8s.264.nstart.cloud
+
+extraEnv:
+  - name: SERVER_PORT
+    value: "8080"
+  - name: SPRING_DATASOURCE_URL
+    value: jdbc:postgresql://pcp-postgres.pcp-dev.svc.altum.local:5432/pcp_complex_plan
+  - name: SPRING_DATASOURCE_USERNAME
+    valueFrom:
+      secretKeyRef:
+        name: pcp-dynamic-plan-db
+        key: SPRING_DATASOURCE_USERNAME
+  - name: SPRING_DATASOURCE_PASSWORD
+    valueFrom:
+      secretKeyRef:
+        name: pcp-dynamic-plan-db
+        key: SPRING_DATASOURCE_PASSWORD

helm/pcp-tgu-service/values-dev.yaml

@@ -15,3 +15,15 @@ ingress:
 extraEnv:
   - name: SERVER_PORT
     value: "8080"
+  - name: SPRING_DATASOURCE_URL
+    value: jdbc:postgresql://pcp-postgres.pcp-dev.svc.altum.local:5432/pcp_tgu
+  - name: SPRING_DATASOURCE_USERNAME
+    valueFrom:
+      secretKeyRef:
+        name: pcp-tgu-db
+        key: SPRING_DATASOURCE_USERNAME
+  - name: SPRING_DATASOURCE_PASSWORD
+    valueFrom:
+      secretKeyRef:
+        name: pcp-tgu-db
+        key: SPRING_DATASOURCE_PASSWORD