diff --git a/config-repo/pcp-complex-mission-service.yaml b/config-repo/pcp-complex-mission-service.yaml index f69530e..65d94fa 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: jdbc:postgresql://${pcp.infra.postgres.host}:${pcp.infra.postgres.port}/pcp_satellites - username: postgres - password: password + url: "${SPRING_DATASOURCE_URL}" + username: "${SPRING_DATASOURCE_USERNAME}" + password: "${SPRING_DATASOURCE_PASSWORD}" jpa: hibernate: ddl-auto: validate diff --git a/helm/pcp-complex-mission-service/values-dev.yaml b/helm/pcp-complex-mission-service/values-dev.yaml index 272c203..5f60b2f 100644 --- a/helm/pcp-complex-mission-service/values-dev.yaml +++ b/helm/pcp-complex-mission-service/values-dev.yaml @@ -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 diff --git a/services/pcp-complex-mission-service/src/main/kotlin/space/nstart/pcp/pcp_satellites_service/model/SatelliteModel.kt b/services/pcp-complex-mission-service/src/main/kotlin/space/nstart/pcp/pcp_satellites_service/model/SatelliteModel.kt index 9ea9535..d0894d1 100644 --- a/services/pcp-complex-mission-service/src/main/kotlin/space/nstart/pcp/pcp_satellites_service/model/SatelliteModel.kt +++ b/services/pcp-complex-mission-service/src/main/kotlin/space/nstart/pcp/pcp_satellites_service/model/SatelliteModel.kt @@ -33,7 +33,6 @@ class SatelliteModel( val longMission : LongTermMission = LongTermMission(), val bls: BLS = BLS(), val scanTLE : Boolean = false - ) { fun toDTO() = SatelliteInfoDTO(