From 486c0250a2e4c7882993c20725573a055c0e64bc Mon Sep 17 00:00:00 2001 From: shivam-eGov Date: Tue, 26 Dec 2023 16:44:24 +0530 Subject: [PATCH] urban: fix git sync & config --- .../helm/charts/cluster-configs/values.yaml | 2 +- .../helm/environments/unified-urban-dev.yaml | 21 ++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/deploy-as-code/helm/charts/cluster-configs/values.yaml b/deploy-as-code/helm/charts/cluster-configs/values.yaml index 7c5065d2f5..9c25b71846 100644 --- a/deploy-as-code/helm/charts/cluster-configs/values.yaml +++ b/deploy-as-code/helm/charts/cluster-configs/values.yaml @@ -80,7 +80,7 @@ cluster-configs: name: home-isolation-notification-mail git-sync: - namespace: [ egov, health ] + namespace: [ egov, health, urban ] name: git-creds kibana: diff --git a/deploy-as-code/helm/environments/unified-urban-dev.yaml b/deploy-as-code/helm/environments/unified-urban-dev.yaml index 903af07f79..4c42997fd1 100644 --- a/deploy-as-code/helm/environments/unified-urban-dev.yaml +++ b/deploy-as-code/helm/environments/unified-urban-dev.yaml @@ -276,7 +276,7 @@ egov-mdms-service: initContainers: gitSync: repo: "git@github.com:egovernments/egov-mdms-data" - branch: "QA" + branch: "UNIFIED-DEV" mdms-folder: "egov-mdms-data" masters-config-url: "file:///work-dir/egov-mdms-data/master-config.json" java-args: -Dspring.profiles.active=monitoring @@ -311,7 +311,7 @@ egov-indexer: initContainers: gitSync: repo: "git@github.com:egovernments/configs" - branch: "qa" + branch: "UNIFIED-DEV" egov-indexer-yaml-repo-path: "file:///work-dir/configs/egov-indexer/privacy-audit.yaml,file:///work-dir/configs/egov-indexer/billingservices-indexer.yml,file:///work-dir/configs/egov-indexer/collection-indexer.yml,file:///work-dir/configs/egov-indexer/egov-telemetry-indexer.yml,file:///work-dir/configs/egov-indexer/egov-uploader-indexer.yml,file:///work-dir/configs/egov-indexer/error-queue.yml,file:///work-dir/configs/egov-indexer/finance-rolloutadotpion-indexer.yml,file:///work-dir/configs/egov-indexer/payment-indexer.yml,file:///work-dir/configs/egov-indexer/pgr-services.yml,file:///work-dir/configs/egov-indexer/rainmaker-pgr-indexer.yml,file:///work-dir/configs/egov-indexer/rainmaker-pt-indexer.yml,file:///work-dir/configs/egov-indexer/rainmaker-tl-indexer.yml,file:///work-dir/configs/egov-indexer/chatbot-telemetry.yaml,file:///work-dir/configs/egov-indexer/water-service.yml,file:///work-dir/configs/egov-indexer/water-services-meter.yml,file:///work-dir/configs/egov-indexer/sewerage-service.yml,file:///work-dir/configs/egov-indexer/property-services.yml,file:///work-dir/configs/egov-indexer/chatbot-telemetry-v2.yaml,file:///work-dir/configs/egov-indexer/egov-fsm.yaml,file:///work-dir/configs/egov-indexer/egov-vehicle.yaml,file:///work-dir/configs/egov-indexer/egov-vendor.yaml,file:///work-dir/configs/egov-indexer/egov-url-shortening-indexer.yaml,file:///work-dir/configs/egov-indexer/fire-noc-service.yml,file:///work-dir/configs/egov-indexer/egov-echallan.yml,file:///work-dir/configs/egov-indexer/egov-bpa-indexer.yml,file:///work-dir/configs/egov-indexer/edcr-indexer.yml,file:///work-dir/configs/egov-indexer/rainmaker-birth-indexer.yml,file:///work-dir/configs/egov-indexer/rainmaker-death-indexer.yml,file:///work-dir/configs/egov-indexer/ws-event-indexer.yml,file:///work-dir/configs/egov-indexer/egov-error-queue-indexer.yml" extraEnv: java: | @@ -333,7 +333,7 @@ egov-persister: initContainers: gitSync: repo: "git@github.com:egovernments/configs" - branch: "qa" + branch: "UNIFIED-DEV" egov-localization: replicas: 1 @@ -342,7 +342,7 @@ egov-data-uploader: initContainers: gitSync: repo: "git@github.com:egovernments/configs" - branch: "qa" + branch: "UNIFIED-DEV" egov-searcher: replicas: 2 @@ -350,7 +350,7 @@ egov-searcher: initContainers: gitSync: repo: "git@github.com:egovernments/configs" - branch: "qa" + branch: "UNIFIED-DEV" egov-custom-consumer: erp-host: "https://mohali-qa.digit.org/" @@ -413,6 +413,7 @@ national-dashboard-ingest: ingress: context: "urban-national-dashboard-ingest" heap: "-Xmx750m -Xms750m" + memory_limits: "850Mi" server-tomcat-max-threads: 25 module-index-mapping: '{"PT": "pt-national-dashboard", "PGR": "pgr-national-dashboard", "WS": "ws-national-dashboard", "FIRENOC": "firenoc-national-dashboard", "TL": "tl-national-dashboard", "MCOLLECT": "mcollect-national-dashboard", "OBPS": "obps-national-dashboard", "COMMON": "common-national-dashboard", "BPA": "bpa-national-dashboard","BIRTH":"birth-cert-national-dashboard"}' master-data-index: "master-national-dashboard" @@ -488,7 +489,7 @@ dashboard-analytics: initContainers: gitSync: repo: "git@github.com:egovernments/configs" - branch: "qa" + branch: "UNIFIED-DEV" extraEnv: java: | - name: SERVER_CONTEXT_PATH @@ -511,7 +512,7 @@ dashboard-ingest: initContainers: gitSync: repo: "git@github.com:egovernments/configs" - branch: "qa" + branch: "UNIFIED-DEV" extraEnv: java: | - name: SERVER_CONTEXT_PATH @@ -557,7 +558,7 @@ report: initContainers: gitSync: repo: "git@github.com:egovernments/configs" - branch: "qa" + branch: "UNIFIED-DEV" report-locationsfile-path: "file:///work-dir/configs/reports/reportFileLocationsv1.txt" # <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< @@ -624,7 +625,7 @@ pdf-service: initContainers: gitSync: repo: "git@github.com:egovernments/configs" - branch: "qa" + branch: "UNIFIED-DEV" data-config-urls: "file:///work-dir/configs/pdf-service/data-config/tradelicense-receipt.json,file:///work-dir/configs/pdf-service/data-config/property-receipt.json,file:///work-dir/configs/pdf-service/data-config/property-bill.json,file:///work-dir/configs/pdf-service/data-config/tradelicense-bill.json,file:///work-dir/configs/pdf-service/data-config/firenoc-receipt.json,file:///work-dir/configs/pdf-service/data-config/pt-receipt.json,file:///work-dir/configs/pdf-service/data-config/tl-receipt.json,file:///work-dir/configs/pdf-service/data-config/consolidatedbill.json,file:///work-dir/configs/pdf-service/data-config/consolidatedreceipt.json,file:///work-dir/configs/pdf-service/data-config/tlapplication.json,file:///work-dir/configs/pdf-service/data-config/ws-consolidatedacknowlegment.json,file:///work-dir/configs/pdf-service/data-config/ws-consolidatedsewerageconnection.json,file:///work-dir/configs/pdf-service/data-config/tlcertificate.json,file:///work-dir/configs/pdf-service/data-config/buildingpermit.json,file:///work-dir/configs/pdf-service/data-config/ptmutationcertificate.json,file:///work-dir/configs/pdf-service/data-config/tlrenewalcertificate.json,file:///work-dir/configs/pdf-service/data-config/bpa-revocation.json,file:///work-dir/configs/pdf-service/data-config/ws-applicationsewerage.json,file:///work-dir/configs/pdf-service/data-config/ws-applicationwater.json,file:///work-dir/configs/pdf-service/data-config/buildingpermit-low.json,file:///work-dir/configs/pdf-service/data-config/misc-receipt.json,file:///work-dir/configs/pdf-service/data-config/ws-estimationnotice.json,file:///work-dir/configs/pdf-service/data-config/ws-sanctionletter.json,file:///work-dir/configs/pdf-service/data-config/ws-bill.json,file:///work-dir/configs/pdf-service/data-config/ws-onetime-receipt.json,file:///work-dir/configs/pdf-service/data-config/occupancy-certificate.json, file:///work-dir/configs/pdf-service/data-config/bill-amendment.json, file:///work-dir/configs/pdf-service/data-config/bill-amendment-note.json, file:///work-dir/configs/pdf-service/data-config/fsm-receipt.json, file:///work-dir/configs/pdf-service/data-config/sewerage-bill-amendment-note.json, file:///work-dir/configs/pdf-service/data-config/mcollect-bill.json, file:///work-dir/configs/pdf-service/data-config/mcollect-challan.json,file:///work-dir/configs/pdf-service/data-config/birth-certificate-pdf.json, file:///work-dir/configs/pdf-service/data-config/death-certificate.json,file:///work-dir/configs/pdf-service/data-config/ws-waterdisconnection.json,file:///work-dir/configs/pdf-service/data-config/ws-sewagedisconnection.json,file:///work-dir/configs/pdf-service/data-config/ws-waterdisconnectionnotice.json,file:///work-dir/configs/pdf-service/data-config/ws-seweragedisconnectionnotice.json,file:///work-dir/configs/pdf-service/data-config/ws-sewerageconnectiondetails.json,file:///work-dir/configs/pdf-service/data-config/ws-waterconnectiondetails-metered.json,file:///work-dir/configs/pdf-service/data-config/ws-waterconnectiondetails-nonmetered.json" format-config-urls: "file:///work-dir/configs/pdf-service/format-config/tradelicense-receipt.json,file:///work-dir/configs/pdf-service/format-config/property-receipt.json,file:///work-dir/configs/pdf-service/format-config/property-bill.json,file:///work-dir/configs/pdf-service/format-config/tradelicense-bill.json,file:///work-dir/configs/pdf-service/format-config/firenoc-receipt.json,file:///work-dir/configs/pdf-service/format-config/pt-receipt.json,file:///work-dir/configs/pdf-service/format-config/tl-receipt.json,file:///work-dir/configs/pdf-service/format-config/consolidatedbill.json,file:///work-dir/configs/pdf-service/format-config/consolidatedreceipt.json,file:///work-dir/configs/pdf-service/format-config/tlapplication.json,file:///work-dir/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json,file:///work-dir/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json,file:///work-dir/configs/pdf-service/format-config/tlcertificate.json,file:///work-dir/configs/pdf-service/format-config/buildingpermit.json,file:///work-dir/configs/pdf-service/format-config/ptmutationcertificate.json,file:///work-dir/configs/pdf-service/format-config/tlrenewalcertificate.json,file:///work-dir/configs/pdf-service/format-config/bpa-revocation.json,file:///work-dir/configs/pdf-service/format-config/ws-applicationsewerage.json,file:///work-dir/configs/pdf-service/format-config/ws-applicationwater.json,file:///work-dir/configs/pdf-service/format-config/buildingpermit-low.json,file:///work-dir/configs/pdf-service/format-config/misc-receipt.json,file:///work-dir/configs/pdf-service/format-config/ws-estimationnotice.json,file:///work-dir/configs/pdf-service/format-config/ws-sanctionletter.json,file:///work-dir/configs/pdf-service/format-config/ws-bill.json,file:///work-dir/configs/pdf-service/format-config/ws-onetime-receipt.json,file:///work-dir/configs/pdf-service/format-config/occupancy-certificate.json, file:///work-dir/configs/pdf-service/format-config/bill-amendment.json, file:///work-dir/configs/pdf-service/format-config/bill-amendment-note.json, file:///work-dir/configs/pdf-service/format-config/fsm-receipt.json, file:///work-dir/configs/pdf-service/format-config/sewerage-bill-amendment-note.json, file:///work-dir/configs/pdf-service/format-config/mcollect-bill.json, file:///work-dir/configs/pdf-service/format-config/mcollect-challan.json,file:///work-dir/configs/pdf-service/format-config/birth-certificate.json, file:///work-dir/configs/pdf-service/format-config/death-certificate.json, file:///work-dir/configs/pdf-service/format-config/ws-sewagedisconnection.json, file:///work-dir/configs/pdf-service/format-config/ws-waterdisconnection.json, file:///work-dir/configs/pdf-service/format-config/ws-waterdisconnectionnotice.json, file:///work-dir/configs/pdf-service/format-config/ws-seweragedisconnectionnotice.json, file:///work-dir/configs/pdf-service/format-config/ws-sewerageconnectiondetails.json, file:///work-dir/configs/pdf-service/format-config/ws-waterconnectiondetails-metered.json, file:///work-dir/configs/pdf-service/format-config/ws-waterconnectiondetails-nonmetered.json" persistence: @@ -978,7 +979,7 @@ grafana: gitSync: enabled: true repo: "git@github.com:egovernments/configs" - branch: "qa" + branch: "UNIFIED-DEV" # minio >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> minio: mode: distributed