Merge branch 'dev' into route-processing
Conflict resolution: - build.gradle.kts: dev version (keep nstart.cloud repo + jacoco/asm mavenCentral) - settings.gradle.kts: project name from route-processing (observatio-terrae), rest from dev - config addresses (application-local, pcp-mission-planing-service, pcp-dynamic-plan application.yaml): dev versions - menu.html: merged both branches (TGU planning + bookings items) - CatalogControllerTest.kt: merged both mocks (TguPlanningService + BallisticsService) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -9,3 +9,19 @@ service:
|
||||
ingress:
|
||||
enabled: true
|
||||
host: pcp-ballistics-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_ballistics
|
||||
- name: SPRING_DATASOURCE_USERNAME
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: pcp-ballistics-db
|
||||
key: SPRING_DATASOURCE_USERNAME
|
||||
- name: SPRING_DATASOURCE_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: pcp-ballistics-db
|
||||
key: SPRING_DATASOURCE_PASSWORD
|
||||
@@ -9,3 +9,19 @@ service:
|
||||
ingress:
|
||||
enabled: true
|
||||
host: pcp-complex-mission-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_missions
|
||||
- name: SPRING_DATASOURCE_USERNAME
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: pcp-complex-missions-db
|
||||
key: SPRING_DATASOURCE_USERNAME
|
||||
- name: SPRING_DATASOURCE_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: pcp-complex-missions-db
|
||||
key: SPRING_DATASOURCE_PASSWORD
|
||||
|
||||
@@ -13,3 +13,15 @@ ingress:
|
||||
extraEnv:
|
||||
- name: SERVER_PORT
|
||||
value: "8080"
|
||||
- name: SPRING_DATASOURCE_URL
|
||||
value: jdbc:postgresql://pcp-postgres.pcp-dev.svc.altum.local:5432/pcp_missions
|
||||
- name: SPRING_DATASOURCE_USERNAME
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: pcp-missions-db
|
||||
key: SPRING_DATASOURCE_USERNAME
|
||||
- name: SPRING_DATASOURCE_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: pcp-missions-db
|
||||
key: SPRING_DATASOURCE_PASSWORD
|
||||
@@ -13,3 +13,15 @@ ingress:
|
||||
extraEnv:
|
||||
- name: SERVER_PORT
|
||||
value: "8080"
|
||||
- name: SPRING_DATASOURCE_URL
|
||||
value: jdbc:postgresql://pcp-postgres.pcp-dev.svc.altum.local:5432/pcp_requests
|
||||
- name: SPRING_DATASOURCE_USERNAME
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: pcp-requests-db
|
||||
key: SPRING_DATASOURCE_USERNAME
|
||||
- name: SPRING_DATASOURCE_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: pcp-requests-db
|
||||
key: SPRING_DATASOURCE_PASSWORD
|
||||
@@ -13,3 +13,15 @@ ingress:
|
||||
extraEnv:
|
||||
- name: SERVER_PORT
|
||||
value: "8080"
|
||||
- name: SPRING_DATASOURCE_URL
|
||||
value: jdbc:postgresql://pcp-postgres.pcp-dev.svc.altum.local:5432/pcp_stations
|
||||
- name: SPRING_DATASOURCE_USERNAME
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: pcp-stations-db
|
||||
key: SPRING_DATASOURCE_USERNAME
|
||||
- name: SPRING_DATASOURCE_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: pcp-stations-db
|
||||
key: SPRING_DATASOURCE_PASSWORD
|
||||
@@ -13,3 +13,5 @@ ingress:
|
||||
extraEnv:
|
||||
- name: SERVER_PORT
|
||||
value: "8080"
|
||||
- name: SETTINGS_TLE_MONITORING_SERVICE
|
||||
value: "http://tle-monitoring-service:8080"
|
||||
|
||||
@@ -12,3 +12,5 @@ ingress:
|
||||
extraEnv:
|
||||
- name: SERVER_PORT
|
||||
value: "8080"
|
||||
- name: SETTINGS_TLE_MONITORING_SERVICE
|
||||
value: "http://tle-monitoring-service:8080"
|
||||
|
||||
@@ -23,3 +23,15 @@ extraEnv:
|
||||
value: "10"
|
||||
- name: SPRING_FLYWAY_CONNECT_RETRIES_INTERVAL
|
||||
value: "5s"
|
||||
- name: SPRING_DATASOURCE_URL
|
||||
value: jdbc:postgresql://pcp-postgres.pcp-dev.svc.altum.local:5432/pcp_slots
|
||||
- name: SPRING_DATASOURCE_USERNAME
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: pcp-slots-db
|
||||
key: SPRING_DATASOURCE_USERNAME
|
||||
- name: SPRING_DATASOURCE_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: pcp-slots-db
|
||||
key: SPRING_DATASOURCE_PASSWORD
|
||||
|
||||
Reference in New Issue
Block a user