diff --git a/configmaps/baseutil-database-configs.yml b/configmaps/baseutil-database-configs.yml index cbef6f2..40ebdbd 100644 --- a/configmaps/baseutil-database-configs.yml +++ b/configmaps/baseutil-database-configs.yml @@ -1,6 +1,6 @@ apiVersion: v1 data: - db-base-utility-url: jdbc:postgresql://172.15.100.52:5432/quat + db-base-utility-url: jdbc:postgresql://172.15.100.28:5432/temp-quat-database db-dialect: org.hibernate.dialect.PostgreSQLDialect db-driver: org.postgresql.Driver SPRING_JPA_HIBERNATE_DDL-AUTO: update diff --git a/configmaps/ehr-database-configs.yml b/configmaps/ehr-database-configs.yml index e688ede..c70db58 100644 --- a/configmaps/ehr-database-configs.yml +++ b/configmaps/ehr-database-configs.yml @@ -1,12 +1,12 @@ apiVersion: v1 data: - database-url: jdbc:postgresql://172.15.100.52:5432/quat - database-url-second: jdbc:postgresql://172.15.100.52:5432/quat + database-url: jdbc:postgresql://172.15.100.28:5432/temp-quat-database + database-url-second: jdbc:postgresql://172.15.100.28:5432/temp-quat-database db-dialect: org.hibernate.dialect.PostgreSQLDialect db-driver: org.postgresql.Driver db-or-anesthesia-schema: EH_ORANESTHESIA - db-spe-url: jdbc:postgresql://172.15.100.52:5432/quat - db-ip-url: jdbc:postgresql://172.15.100.52:5432/quat + db-spe-url: jdbc:postgresql://172.15.100.28:5432/temp-quat-database + db-ip-url: jdbc:postgresql://172.15.100.28:5432/temp-quat-database EHR_WORKFLOW_MONGO_URI: mongodb://admin:admin@172.15.100.24:27017/task_list?tls=true&tlsAllowInvalidCertificates=true kind: ConfigMap metadata: diff --git a/configmaps/iam-service-configs.yml b/configmaps/iam-service-configs.yml index 0647bcb..685cd1b 100644 --- a/configmaps/iam-service-configs.yml +++ b/configmaps/iam-service-configs.yml @@ -9,7 +9,7 @@ data: KEYCLOAK_HOSTNAME: csi.dev.cloudsol.lk REPORTING_QUEUE_NAME: csi-reporting # DB_CONNECTION_STRING: jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=10.201.217.11)(PORT=1521))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME =VIDA4PDB))) - DB_CONNECTION_STRING: jdbc:postgresql://172.15.100.52:5432/quat + DB_CONNECTION_STRING: jdbc:postgresql://172.15.100.28:5432/temp-quat-database kind: ConfigMap metadata: name: iam-service-configs diff --git a/configmaps/init-database-configs.yaml b/configmaps/init-database-configs.yaml index ee840ce..cb9d025 100644 --- a/configmaps/init-database-configs.yaml +++ b/configmaps/init-database-configs.yaml @@ -1,10 +1,10 @@ apiVersion: v1 data: - CSI_INIT_DB_MASTERDATA_URL: jdbc:postgresql://172.15.100.52:5432/quat - CSI_INIT_DB_CONFIG_URL: jdbc:postgresql://172.15.100.52:5432/quat - CSI_INIT_DB_BASEUTIL_URL: jdbc:postgresql://172.15.100.52:5432/quat - CSI_INIT_DB_BL_INVOICE_URL: jdbc:postgresql://172.15.100.52:5432/quat - CSI_INIT_DB_BL_INVOICE_URL: jdbc:postgresql://172.15.100.52:5432/quat + CSI_INIT_DB_MASTERDATA_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database + CSI_INIT_DB_CONFIG_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database + CSI_INIT_DB_BASEUTIL_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database + CSI_INIT_DB_BL_INVOICE_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database + CSI_INIT_DB_BL_INVOICE_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database SCREEN_PERMISSION_API_END_POINT: http://service-base-ui-registry/ui-registry/save SCREEN_PERMISSION_X_GROUP: "1" SCREEN_PERMISSION_X_HOSPITAL: "4" @@ -26,7 +26,7 @@ data: MASTER_DATA_DISABLED: "true" MONGO_DB_URL: mongodb://admin:admin@172.15.100.24:27017/csi-morgue?tls=true&tlsAllowInvalidCertificates=truereadPreference=nearest #RELATIONAL_DATABASE_URL: jdbc:oracle:thin:@(description=(CONNECT_TIMEOUT=10)(TRANSPORT_CONNECT_TIMEOUT=5)(RETRY_COUNT=3)(address=(host=VIDAUDB.hmg.local)(protocol=tcp)(port=1521))(failover=yes)(connect_data=(SERVER=DEDICATED)(service_name=vuatpdb.hmg.local)(failover_mode=(type=select)(method=basic)))) - RELATIONAL_DATABASE_URL: jdbc:postgresql://172.15.100.52:5432/quat + RELATIONAL_DATABASE_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database SCREEN_PERMISSION_API_END_POINT: http://service-base-ui-registry/ui-registry/save FEATURE_TOGGLE_API_END_POINT: 'http://csi-java-base-utility/base/util/tenant' LIQUIBASE_DB_MIGRATION: "true" diff --git a/configmaps/security-database-configs.yml b/configmaps/security-database-configs.yml index 017e98f..1242917 100644 --- a/configmaps/security-database-configs.yml +++ b/configmaps/security-database-configs.yml @@ -1,11 +1,11 @@ apiVersion: v1 data: - database-url: jdbc:postgresql://172.15.100.52:5432/quat + database-url: jdbc:postgresql://172.15.100.28:5432/temp-quat-database db-dialect: org.hibernate.dialect.PostgreSQLDialect db-driver: org.postgresql.Driver - permission-mongodb-uri: mongodb://admin:admin@172.15.100.24:27017/roles-permissions-01?tls=true&tlsAllowInvalidCertificates=truereadPreference=nearest - ui-reg-mongodb-uri: mongodb://admin:admin@172.15.100.24:27017/ui-registry-01?tls=true&tlsAllowInvalidCertificates=truereadPreference=nearest - csi.personalization.mongo.uri: mongodb://admin:admin@172.15.100.24:27017/csi-personalisation?tls=true&tlsAllowInvalidCertificates=true + permission-mongodb-uri: mongodb://admin:admin@172.15.100.24:27017/roles-permissions-01?&readPreference=nearest + ui-reg-mongodb-uri: mongodb://admin:admin@172.15.100.24:27017/ui-registry-01?&readPreference=nearest + csi.personalization.mongo.uri: mongodb://admin:admin@172.15.100.24:27017/csi-personalisation kind: ConfigMap metadata: diff --git a/configmaps/service-config-bloodbank.yml b/configmaps/service-config-bloodbank.yml index 372e505..36a1ae7 100644 --- a/configmaps/service-config-bloodbank.yml +++ b/configmaps/service-config-bloodbank.yml @@ -2,9 +2,9 @@ apiVersion: v1 data: active_profile: java-dev bloodTransfusion-db-platform: org.hibernate.dialect.PostgreSQLDialect - bloodTransfusion-db-url: jdbc:postgresql://172.15.100.52:5432/quat?currentSchema=bb_transfusion + bloodTransfusion-db-url: jdbc:postgresql://172.15.100.28:5432/temp-quat-database?currentSchema=bb_transfusion bloodbank-db-platform: org.hibernate.dialect.PostgreSQLDialect - bloodbank-db-url: jdbc:postgresql://172.15.100.52:5432/quat?currentSchema=bb_bloodbank + bloodbank-db-url: jdbc:postgresql://172.15.100.28:5432/temp-quat-database?currentSchema=bb_bloodbank configserver: http://config-server eureka_server: http://eureka:8761/eureka/ rootDomainName: cloudsol.lk diff --git a/configmaps/service-config-pharmacy.yml b/configmaps/service-config-pharmacy.yml index 862fa88..b7f0a3a 100644 --- a/configmaps/service-config-pharmacy.yml +++ b/configmaps/service-config-pharmacy.yml @@ -8,8 +8,8 @@ data: discharge-summary-clear-notification: adt-discharge-summary-clear-notification.t eureka_server: http://eureka:8761/eureka/ pharmacy-db-platform: org.hibernate.dialect.PostgreSQLDialect - pharmacy-db-url: jdbc:postgresql://172.15.100.52:5432/quat - prescription-db-url: jdbc:postgresql://172.15.100.52:5432/quat + pharmacy-db-url: jdbc:postgresql://172.15.100.28:5432/temp-quat-database + prescription-db-url: jdbc:postgresql://172.15.100.28:5432/temp-quat-database prescription-db-platform: org.hibernate.dialect.PostgreSQLDialect mongodb-phr-cron-uri: mongodb://admin:admin@172.15.100.24:27017/cron?tls=true&tlsAllowInvalidCertificates=true diff --git a/configmaps/service-configs-adt.yml b/configmaps/service-configs-adt.yml index 023b3b8..c00ee92 100644 --- a/configmaps/service-configs-adt.yml +++ b/configmaps/service-configs-adt.yml @@ -1,11 +1,11 @@ apiVersion: v1 data: - CSI_DB_ADT_URL: jdbc:postgresql://172.15.100.52:5432/quat - CSI_DB_DENTAL_URL: jdbc:postgresql://172.15.100.52:5432/quat - CSI_DB_MASTERDATA_URL: jdbc:postgresql://172.15.100.52:5432/quat - CSI_DB_RESERVATION_URL: jdbc:postgresql://172.15.100.52:5432/quat - CSI_DB_RESOURCE_URL: jdbc:postgresql://172.15.100.52:5432/quat - CSI_DB_MORGUE_URL: jdbc:postgresql://172.15.100.52:5432/quat + CSI_DB_ADT_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database + CSI_DB_DENTAL_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database + CSI_DB_MASTERDATA_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database + CSI_DB_RESERVATION_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database + CSI_DB_RESOURCE_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database + CSI_DB_MORGUE_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database SPRING_DATASOURCE_DRIVER-CLASS-NAME: org.postgresql.Driver SPRING_JPA_DATABASE-PLATFORM: org.hibernate.dialect.PostgreSQLDialect CSI_RMS_ADTREQUEST_MONGOURI: mongodb://admin:admin@172.15.100.24:27017/adt-request?tls=true&tlsAllowInvalidCertificates=truereadPreference=nearest&maxStalenessSeconds=300 diff --git a/configmaps/service-configs-bm-promotional.yaml b/configmaps/service-configs-bm-promotional.yaml index 4b5d4fd..9e6ca26 100644 --- a/configmaps/service-configs-bm-promotional.yaml +++ b/configmaps/service-configs-bm-promotional.yaml @@ -1,6 +1,6 @@ apiVersion: v1 data: - CSI_DB_BM_PROMOTION_URL: jdbc:postgresql://172.15.100.52:5432/quat + CSI_DB_BM_PROMOTION_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database CSI_DB_SERVER: postgres #SPRING_JPA_DATABASE-PLATFORM: org.hibernate.dialect.Oracle10gDialect configserver: http://config-server diff --git a/configmaps/service-configs-bm.yml b/configmaps/service-configs-bm.yml index e8b3826..f4368c4 100644 --- a/configmaps/service-configs-bm.yml +++ b/configmaps/service-configs-bm.yml @@ -1,8 +1,8 @@ apiVersion: v1 data: - CSI_DB_BM_APPROVAL_URL: jdbc:postgresql://172.15.100.52:5432/quat - CSI_DB_BM_BILLING_URL: jdbc:postgresql://172.15.100.52:5432/quat - CSI_DB_BM_INVOICE_URL: jdbc:postgresql://172.15.100.52:5432/quat + CSI_DB_BM_APPROVAL_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database + CSI_DB_BM_BILLING_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database + CSI_DB_BM_INVOICE_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database CSI_DB_PORT: "1521" CSI_DB_SERVER: postgress SPRING_DATASOURCE_DRIVER-CLASS-NAME: org.postgresql.Driver diff --git a/configmaps/service-configs-cssd.yaml b/configmaps/service-configs-cssd.yaml index 2f79417..8536c6a 100644 --- a/configmaps/service-configs-cssd.yaml +++ b/configmaps/service-configs-cssd.yaml @@ -1,7 +1,7 @@ apiVersion: v1 data: - SPRING_DATASOURCE_URL: jdbc:postgresql://172.15.100.52:5432/quat - database-url: jdbc:postgresql://172.15.100.52:5432/quat + SPRING_DATASOURCE_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database + database-url: jdbc:postgresql://172.15.100.28:5432/temp-quat-database CSI_DB_SERVER: POSTGRESQL SPRING_JPA_HIBERNATE_DIALECT: org.hibernate.dialect.PostgreSQLDialect #SPRING_JPA_DATABASE-PLATFORM: org.hibernate.dialect.Oracle12cDialect diff --git a/configmaps/service-configs-dms.yml b/configmaps/service-configs-dms.yml index a7ce5e6..16422e1 100644 --- a/configmaps/service-configs-dms.yml +++ b/configmaps/service-configs-dms.yml @@ -11,7 +11,7 @@ data: db_driver: org.postgresql.Driver db_profile: slick.jdbc.PostgresProfile db_driver: org.postgresql.Driver - db_url: jdbc:postgresql://172.15.100.52:5432/quat + db_url: jdbc:postgresql://172.15.100.28:5432/temp-quat-database minio_endpoint: http://172.15.100.68:7480 mongo_connection_string: mongodb://admin:admin@172.15.100.24:27017/?tls=true&tlsAllowInvalidCertificates=true kind: ConfigMap diff --git a/configmaps/service-configs-document-management-service b/configmaps/service-configs-document-management-service index 64e4663..fd0d07a 100644 --- a/configmaps/service-configs-document-management-service +++ b/configmaps/service-configs-document-management-service @@ -1,7 +1,7 @@ apiVersion: v1 data: SPRING_DATASOURCE_DRIVER-CLASS-NAME: org.postgresql.Driver - SPRING_DATASOURCE_URL: jdbc:postgresql://172.15.100.52:5432/quat + SPRING_DATASOURCE_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database SPRING_JPA_PROPERTIES_HIBERNATE_DIALECT: org.hibernate.dialect.PostgreSQLDialect # SPRING_LIQUIBASE_CHANGE-LOG: classpath:db/changelog/postgres/changelog-master.xml MINIO_ENDPOINT: http://172.15.100.68:7480 diff --git a/configmaps/service-configs-empi-api.yaml b/configmaps/service-configs-empi-api.yaml index 25edc29..f88148d 100644 --- a/configmaps/service-configs-empi-api.yaml +++ b/configmaps/service-configs-empi-api.yaml @@ -6,7 +6,7 @@ data: active_profile: java-dev JPA_DIALECT: org.hibernate.dialect.PostgreSQLDialect DB_SCHEMA: EMPI - DB_JDBC_URL: jdbc:postgresql://172.15.100.52:5432/quat + DB_JDBC_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database DB_DRIVER_CLASS_NAME: org.postgresql.Driver #HIBERNATE_DDL_AUTO: "false" KAFKA_PRODUCER_BOOTSTRAP_SERVER_URLS: 172.15.100.80:9092,172.15.100.81:9092,172.15.100.82:9092 diff --git a/configmaps/service-configs-integration.yml b/configmaps/service-configs-integration.yml index 5b95716..0938989 100644 --- a/configmaps/service-configs-integration.yml +++ b/configmaps/service-configs-integration.yml @@ -2,9 +2,9 @@ apiVersion: v1 data: dbVendor: postgres CSI_DB_DRIVER: org.postgresql.Driver - CSI_DB_INT_URL: jdbc:postgresql://172.15.100.52:5432/quat - CSI_DB_INT2_URL: jdbc:postgresql://172.15.100.52:5432/quat - CSI_DB_MOBILE_URL: jdbc:postgresql://172.15.100.52:5432/quat + CSI_DB_INT_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database + CSI_DB_INT2_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database + CSI_DB_MOBILE_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database CSI_DB_PLATFORM: org.hibernate.dialect.PostgreSQLDialect CSI_DB_INT_PLATFORM: org.hibernate.dialect.PostgreSQLDialect CSI_DB_MOBILE_SEQUENCETEMPLATE: "SELECT ##sequence_name##.NEXTVAL FROM dual" diff --git a/configmaps/service-configs-jdbc-sink.yaml b/configmaps/service-configs-jdbc-sink.yaml index ec07293..da7b34c 100644 --- a/configmaps/service-configs-jdbc-sink.yaml +++ b/configmaps/service-configs-jdbc-sink.yaml @@ -2,7 +2,7 @@ apiVersion: v1 data: METADATA_TOPIC: form-metadata-queue DATA_TOPIC: form-data-queue - ORACLE_URL: jdbc:postgresql://172.15.100.52:5432/quat + ORACLE_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database BOOTSTRAP_SERVERS: 172.15.100.80:9092,172.15.100.81:9092,172.15.100.82:9092 kind: ConfigMap metadata: diff --git a/configmaps/service-configs-reporting.yml b/configmaps/service-configs-reporting.yml index c897b70..acf0815 100644 --- a/configmaps/service-configs-reporting.yml +++ b/configmaps/service-configs-reporting.yml @@ -2,16 +2,16 @@ apiVersion: v1 data: METADB_DRIVER: org.postgresql.Driver METADB_PROFILE: slick.jdbc.PostgresProfile - METADB_URL: jdbc:postgresql://172.15.100.52:5432/quat + METADB_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database WAREHOUSEDB_DB_DRIVER: org.postgresql.Driver WAREHOUSEDB_DRIVER: slick.driver.PostgresqlDriver WAREHOUSEDB_PROFILE: slick.jdbc.PostgresProfile - WAREHOUSEDB_URL: jdbc:postgresql://172.15.100.52:5432/quat + WAREHOUSEDB_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database METADB_NUM_THREADS : "10" METADB_MAX_CONNECTIONS : "10" APP_DB_DRIVER: org.postgresql.Driver APP_DB_PROFILE: slick.jdbc.PostgresProfile - APP_DB_URL: jdbc:postgresql://172.15.100.52:5432/quat + APP_DB_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database # active_hospital_filter: "true" # hospital_id_columns: HOSPITAL_ID,HOSPITALID # tenant_id_columns: HOSPITAL_GROUP_ID,HOSPITALGROUPID,TENANT_ID,TENANTID diff --git a/configmaps/service-configs-rf-uploader.yml b/configmaps/service-configs-rf-uploader.yml index a5ea814..c8f1184 100644 --- a/configmaps/service-configs-rf-uploader.yml +++ b/configmaps/service-configs-rf-uploader.yml @@ -3,7 +3,7 @@ data: spring.env.url: http://csi-reporting-service spring.env.path: /csi-api/csi-reporting-service spring.datasource.driver-class-name: org.postgresql.Driver - spring.datasource.url: jdbc:postgresql://172.15.100.52:5432/quat + spring.datasource.url: jdbc:postgresql://172.15.100.28:5432/temp-quat-database kind: ConfigMap metadata: annotations: diff --git a/configmaps/service-configs-stream-etl.yml b/configmaps/service-configs-stream-etl.yml index c793332..bc95b8c 100644 --- a/configmaps/service-configs-stream-etl.yml +++ b/configmaps/service-configs-stream-etl.yml @@ -10,7 +10,7 @@ data: MONGO_CONNECTION_STRING: mongodb://admin:admin@172.15.100.24:27017/?tls=true&tlsAllowInvalidCertificates=true SLICK_DATASOURCE_PROFILE: slick.jdbc.PostgresProfile$ DATASOURCE_DRIVER: org.postgresql.Driver - DATASOURCE_URL: jdbc:postgresql://172.15.100.52:5432/quat + DATASOURCE_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database kind: ConfigMap metadata: diff --git a/extract_common_secret_mappings copy.py b/extract_common_secret_mappings.py similarity index 100% rename from extract_common_secret_mappings copy.py rename to extract_common_secret_mappings.py diff --git a/secrets/iam-service-secret.yml b/secrets/iam-service-secret.yml index ad6c73f..2468c7e 100644 --- a/secrets/iam-service-secret.yml +++ b/secrets/iam-service-secret.yml @@ -1,6 +1,6 @@ apiVersion: v1 data: - DB_DATABASE: cXVhdA== + DB_DATABASE: dGVtcC1xdWF0LWRhdGFiYXNl DB_PASSWORD: cXVhdHBnMTIz DB_USER: c2NfaWFt KEYCLOAK_PASSWORD: cGdzcWw= diff --git a/secrets/service-configs-secret.yml b/secrets/service-configs-secret.yml new file mode 100644 index 0000000..639c29b --- /dev/null +++ b/secrets/service-configs-secret.yml @@ -0,0 +1,8 @@ +apiVersion: v1 +data: + EMPTY_DATA: ZnV0dXJlVXNl +kind: Secret +metadata: + name: service-configs-secret + namespace: csi-uat +type: Opaque