From e86d631a4bf9c74ae9de005d281804ead9086399 Mon Sep 17 00:00:00 2001 From: Shreya-egov <144668573+Shreya-egov@users.noreply.github.com> Date: Wed, 18 Sep 2024 14:36:21 +0530 Subject: [PATCH 01/18] updating mdms endpoints (#3041) --- deploy-as-code/helm/environments/unified-health-qa.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/deploy-as-code/helm/environments/unified-health-qa.yaml b/deploy-as-code/helm/environments/unified-health-qa.yaml index 85a3ec430f..31eb62c6d4 100644 --- a/deploy-as-code/helm/environments/unified-health-qa.yaml +++ b/deploy-as-code/helm/environments/unified-health-qa.yaml @@ -574,13 +574,13 @@ project-factory: mdmsV1SearchEndpoint: 'egov-mdms-service/v1/_search' plan-service: - egov-mdms-service-host-key: 'egov-mdms-service' - egov-mdms-service-endpoint-key: "/egov-mdms-service/v1/_search" + egov-mdms-service-host-key: 'mdms-service-v2' + egov-mdms-service-endpoint-key: "/mdms-v2/v1/_search" resource-estimation-service: - egov-mdms-service-host-key: 'egov-mdms-service' - egov-mdms-service-endpoint-key: "/egov-mdms-service/v1/_search" + egov-mdms-service-host-key: 'mdms-service-v2' + egov-mdms-service-endpoint-key: "/mdms-v2/v1/_search" # <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< From bc756c324d38b6f6b20e29e1b3163864e5045396 Mon Sep 17 00:00:00 2001 From: LataNaik-eGov <42994677+LataNaik-eGov@users.noreply.github.com> Date: Wed, 18 Sep 2024 18:23:47 +0530 Subject: [PATCH 02/18] Update unified-urban-qa.yaml (#3045) --- deploy-as-code/helm/environments/unified-urban-qa.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/deploy-as-code/helm/environments/unified-urban-qa.yaml b/deploy-as-code/helm/environments/unified-urban-qa.yaml index cb32f035df..8ca0e0b250 100644 --- a/deploy-as-code/helm/environments/unified-urban-qa.yaml +++ b/deploy-as-code/helm/environments/unified-urban-qa.yaml @@ -145,6 +145,7 @@ cluster-configs: pgr-services: "http://pgr-services.egov:8080/" birth-death-services: "http://birth-death-services.egov:8080/" egov-pdf: "http://egov-pdf.egov:8080/" + health-hrms: 'http://health-hrms.health:8080/' employee: dashboard-url: "https://dashboard-pbuat.egovernments.org/s/w---s/app/kibana#/dashboard/4e687470-f3c7-11e8-8d09-b151e2b1cf8e?embed=true&_g=(refreshInterval%3A(pause%3A!f%2Cvalue%3A300000)%2Ctime%3A(from%3Anow-15m%2Cmode%3Aquick%2Cto%3Anow))" custom-js-injection: | From cc0383d0e488c1f7c91de790623f1a4152c1c2d9 Mon Sep 17 00:00:00 2001 From: prerna-egov <137176760+prerna-egov@users.noreply.github.com> Date: Fri, 20 Sep 2024 10:47:00 +0530 Subject: [PATCH 03/18] added indexer config path for pgr service (#3053) --- deploy-as-code/helm/environments/unified-qa.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy-as-code/helm/environments/unified-qa.yaml b/deploy-as-code/helm/environments/unified-qa.yaml index 36acd66ce9..31104a6973 100644 --- a/deploy-as-code/helm/environments/unified-qa.yaml +++ b/deploy-as-code/helm/environments/unified-qa.yaml @@ -372,7 +372,7 @@ egov-indexer: gitSync: repo: "git@github.com:egovernments/configs" ##### Change repo url with Your fork Repo url branch: "UNIFIED-QA" ##### Change repo branch with Your fork Repo branch - egov-indexer-yaml-repo-path: "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/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/works/egov-indexer/measurement-indexer.yml,file:///work-dir/configs/works/egov-indexer/project-indexer.yml,file:///work-dir/configs/works/egov-indexer/organisationservices-indexer.yml,file:///work-dir/configs/works/egov-indexer/contractservices-indexer.yml,file:///work-dir/configs/works/egov-indexer/estimateservices-indexer.yml,file:///work-dir/configs/works/egov-indexer/expensebill-indexer.yml,file:///work-dir/configs/works/egov-indexer/individual-indexer.yml,file:///work-dir/configs/works/egov-indexer/musterservices-indexer.yml,file:///work-dir/configs/sanitation/egov-indexer/pqm-service-indexer.yml,file:///work-dir/configs/sanitation/egov-indexer/egov-pqm-service.yml,file:///work-dir/configs/sanitation/egov-indexer/pqm-anomaly-finder-indexer.yml,file:///work-dir/configs/sanitation/egov-indexer/egov-fsm.yaml,file:///work-dir/configs/sanitation/egov-indexer/egov-vehicle.yaml,file:///work-dir/configs/sanitation/egov-indexer/egov-vendor.yaml,file:///work-dir/configs/sanitation/egov-indexer/fsm-inbox-indexer.yml,file:///work-dir/configs/egov-indexer/sample.yml,file:///work-dir/configs/egov-indexer/facility-indexer.yml,file:///work-dir/configs/egov-indexer/household-indexer.yml,file:///work-dir/configs/health/egov-indexer/household-member-indexer.yml,file:///work-dir/configs/health/egov-indexer/household-indexer.yml,file:///work-dir/configs/egov-indexer/individual-indexer.yml,file:///work-dir/configs/egov-indexer/project-indexer.yml,file:///work-dir/configs/egov-indexer/project-staff-indexer.yml,file:///work-dir/configs/egov-indexer/project-task-indexer.yml,file:///work-dir/configs/egov-indexer/referral-management-indexer.yml,file:///work-dir/configs/egov-indexer/stock-indexer.yml,file:///work-dir/configs/health/egov-indexer/facility-indexer.yml,file:///work-dir/configs/health/egov-indexer/household-indexer.yml,file:///work-dir/configs/health/egov-indexer/individual-indexer.yml,file:///work-dir/configs/health/egov-indexer/project-indexer.yml,file:///work-dir/configs/health/egov-indexer/project-staff-indexer.yml,file:///work-dir/configs/health/egov-indexer/project-task-indexer.yml,file:///work-dir/configs/health/egov-indexer/referral-management-indexer.yml,file:///work-dir/configs/health/egov-indexer/stock-indexer.yml,file:///work-dir/configs/egov-indexer/pgr-services.yml,file:///work-dir/configs/egov-indexer/mukta-contractservices-indexer.yml,file:///work-dir/configs/egov-indexer/mukta-estimateservices-indexer.yml,file:///work-dir/configs/egov-indexer/mukta-expensebill-indexer.yml,file:///work-dir/configs/egov-indexer/mukta-individual-indexer.yml,file:///work-dir/configs/ifix/egov-indexer/digit-exchange-indexer.yml,file:///work-dir/configs/works/egov-indexer/mukta-pi-indexer.yml, file:///work-dir/configs/works/egov-indexer/ifms-pi-indexer.yml,file:///work-dir/configs/health/egov-indexer/transformer-pgr-services.yml,file:///work-dir/configs/egov-indexer/service-request-indexer.yml" + egov-indexer-yaml-repo-path: "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/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/works/egov-indexer/measurement-indexer.yml,file:///work-dir/configs/works/egov-indexer/project-indexer.yml,file:///work-dir/configs/works/egov-indexer/organisationservices-indexer.yml,file:///work-dir/configs/works/egov-indexer/contractservices-indexer.yml,file:///work-dir/configs/works/egov-indexer/estimateservices-indexer.yml,file:///work-dir/configs/works/egov-indexer/expensebill-indexer.yml,file:///work-dir/configs/works/egov-indexer/individual-indexer.yml,file:///work-dir/configs/works/egov-indexer/musterservices-indexer.yml,file:///work-dir/configs/sanitation/egov-indexer/pqm-service-indexer.yml,file:///work-dir/configs/sanitation/egov-indexer/egov-pqm-service.yml,file:///work-dir/configs/sanitation/egov-indexer/pqm-anomaly-finder-indexer.yml,file:///work-dir/configs/sanitation/egov-indexer/egov-fsm.yaml,file:///work-dir/configs/sanitation/egov-indexer/egov-vehicle.yaml,file:///work-dir/configs/sanitation/egov-indexer/egov-vendor.yaml,file:///work-dir/configs/sanitation/egov-indexer/fsm-inbox-indexer.yml,file:///work-dir/configs/egov-indexer/sample.yml,file:///work-dir/configs/egov-indexer/facility-indexer.yml,file:///work-dir/configs/egov-indexer/household-indexer.yml,file:///work-dir/configs/health/egov-indexer/household-member-indexer.yml,file:///work-dir/configs/health/egov-indexer/household-indexer.yml,file:///work-dir/configs/egov-indexer/individual-indexer.yml,file:///work-dir/configs/egov-indexer/project-indexer.yml,file:///work-dir/configs/egov-indexer/project-staff-indexer.yml,file:///work-dir/configs/egov-indexer/project-task-indexer.yml,file:///work-dir/configs/egov-indexer/referral-management-indexer.yml,file:///work-dir/configs/egov-indexer/stock-indexer.yml,file:///work-dir/configs/health/egov-indexer/facility-indexer.yml,file:///work-dir/configs/health/egov-indexer/household-indexer.yml,file:///work-dir/configs/health/egov-indexer/individual-indexer.yml,file:///work-dir/configs/health/egov-indexer/project-indexer.yml,file:///work-dir/configs/health/egov-indexer/project-staff-indexer.yml,file:///work-dir/configs/health/egov-indexer/project-task-indexer.yml,file:///work-dir/configs/health/egov-indexer/referral-management-indexer.yml,file:///work-dir/configs/health/egov-indexer/stock-indexer.yml,file:///work-dir/configs/egov-indexer/pgr-services.yml,file:///work-dir/configs/egov-indexer/mukta-contractservices-indexer.yml,file:///work-dir/configs/egov-indexer/mukta-estimateservices-indexer.yml,file:///work-dir/configs/egov-indexer/mukta-expensebill-indexer.yml,file:///work-dir/configs/egov-indexer/mukta-individual-indexer.yml,file:///work-dir/configs/ifix/egov-indexer/digit-exchange-indexer.yml,file:///work-dir/configs/works/egov-indexer/mukta-pi-indexer.yml, file:///work-dir/configs/works/egov-indexer/ifms-pi-indexer.yml,file:///work-dir/configs/health/egov-indexer/transformer-pgr-services.yml,file:///work-dir/configs/egov-indexer/service-request-indexer.yml,file:///work-dir/configs/health/egov-indexer/pgr-services.yml" egov-persister: replicas: 1 images: From 4db3f84ae3474ea3f4c6274d032ab4f95350e832 Mon Sep 17 00:00:00 2001 From: ashish-egov <137176738+ashish-egov@users.noreply.github.com> Date: Fri, 20 Sep 2024 11:00:06 +0530 Subject: [PATCH 04/18] Update values.yaml (#3054) --- .../helm/charts/health-services/project-factory/values.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/deploy-as-code/helm/charts/health-services/project-factory/values.yaml b/deploy-as-code/helm/charts/health-services/project-factory/values.yaml index 75aed3f728..f0fd9bea60 100644 --- a/deploy-as-code/helm/charts/health-services/project-factory/values.yaml +++ b/deploy-as-code/helm/charts/health-services/project-factory/values.yaml @@ -232,9 +232,7 @@ env: | - name: USER_PASSWORD_AUTO_GENERATE value: "true" - name: USER_DEFAULT_PASSWORD - value: "eGov@123" - - name: NOT_CREATE_USER_IF_ALREADY_THERE - value: "true" + value: "eGov@123" - name: MAP_USER_VIA_COMMON_PARENT value: "true" From 13f0dec25974a5c5fe2ed99c15a91c4dc1c5730d Mon Sep 17 00:00:00 2001 From: tanishi-egov Date: Fri, 20 Sep 2024 12:57:51 +0530 Subject: [PATCH 05/18] Adding HRMS and Project Factory host for plan-service (#3052) --- .../charts/health-services/plan-service/values.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/deploy-as-code/helm/charts/health-services/plan-service/values.yaml b/deploy-as-code/helm/charts/health-services/plan-service/values.yaml index 652261ab0f..df38d1a751 100644 --- a/deploy-as-code/helm/charts/health-services/plan-service/values.yaml +++ b/deploy-as-code/helm/charts/health-services/plan-service/values.yaml @@ -65,6 +65,16 @@ env: | value: {{ index .Values "egov-mdms-service-v2-endpoint-key" | quote }} - name: EGOV_MDMS_INTEGRATION_ENABLED value: "true" + - name: EGOV_HRMS_HOST + valueFrom: + configMapKeyRef: + name: egov-service-host + key: health-hrms + - name: EGOV_PROJECT_FACTORY_HOST + valueFrom: + configMapKeyRef: + name: egov-service-host + key: project-factory - name: JAVA_OPTS value: {{ index .Values "heap" | quote }} - name: JAVA_ARGS From 316155ae0db84fd30ea687548d41a70abce491a5 Mon Sep 17 00:00:00 2001 From: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> Date: Mon, 23 Sep 2024 13:43:18 +0530 Subject: [PATCH 06/18] added the enviornment override the context path --- .../charts/health-services/health-mdms-v2/values.yaml | 11 ++++++----- .../helm/environments/unified-health-uat.yaml | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/deploy-as-code/helm/charts/health-services/health-mdms-v2/values.yaml b/deploy-as-code/helm/charts/health-services/health-mdms-v2/values.yaml index 85619c4770..f07059c757 100644 --- a/deploy-as-code/helm/charts/health-services/health-mdms-v2/values.yaml +++ b/deploy-as-code/helm/charts/health-services/health-mdms-v2/values.yaml @@ -10,7 +10,8 @@ ingress: namespace: egov enabled: true zuul: true - context: "egov-mdms-service" + context: "{{ .Values.envContext | default 'egov-mdms-service' }}" + initContainers: dbMigration: @@ -25,8 +26,8 @@ image: replicas: "1" healthChecks: enabled: true - livenessProbePath: "/egov-mdms-service/health" - readinessProbePath: "/egov-mdms-service/health" + livenessProbePath: "{{ printf \"%s/health\" .Values.envContext | default \"/egov-mdms-service/health\" }}" + readinessProbePath: "{{ printf \"%s/health\" .Values.envContext | default \"/egov-mdms-service/health\" }}" appType: "java-spring" tracing-enabled: true @@ -39,9 +40,9 @@ egov-mdms-data-save-topic: "save-mdms-data" # Additional Container Envs env: | - name: SERVER_CONTEXT_PATH - value: /egov-mdms-service + value: {{ printf "/%s" .Values.envContext | default "/egov-mdms-service" }} - name: SERVER_SERVLET_CONTEXT_PATH - value: /egov-mdms-service + value: {{ printf "/%s" .Values.envContext | default "/egov-mdms-service" }} - name: SPRING_KAFKA_CONSUMER_GROUP_ID value: egov-mdms-service-consumer-group - name: SPRING_KAFKA_PRODUCER_KEY_SERIALIZER diff --git a/deploy-as-code/helm/environments/unified-health-uat.yaml b/deploy-as-code/helm/environments/unified-health-uat.yaml index 101a68f5bc..02834e0e4b 100644 --- a/deploy-as-code/helm/environments/unified-health-uat.yaml +++ b/deploy-as-code/helm/environments/unified-health-uat.yaml @@ -222,6 +222,7 @@ egov-idgen: health-mdms-v2: memory_limits: 512Mi + envContext: "egov-mdms-service" egov-notification-sms: sms-provider-url: "sms provider url" ## Add sms provider url From f90d0eb8c23b7c887c41c32acdc97473de05d518 Mon Sep 17 00:00:00 2001 From: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> Date: Mon, 23 Sep 2024 14:18:35 +0530 Subject: [PATCH 07/18] updated the contexts --- .../charts/health-services/health-mdms-v2/values.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/deploy-as-code/helm/charts/health-services/health-mdms-v2/values.yaml b/deploy-as-code/helm/charts/health-services/health-mdms-v2/values.yaml index f07059c757..c2df0e4825 100644 --- a/deploy-as-code/helm/charts/health-services/health-mdms-v2/values.yaml +++ b/deploy-as-code/helm/charts/health-services/health-mdms-v2/values.yaml @@ -10,7 +10,7 @@ ingress: namespace: egov enabled: true zuul: true - context: "{{ .Values.envContext | default 'egov-mdms-service' }}" + context: {{ .Values.envContext | default "egov-mdms-service" }} initContainers: @@ -26,8 +26,8 @@ image: replicas: "1" healthChecks: enabled: true - livenessProbePath: "{{ printf \"%s/health\" .Values.envContext | default \"/egov-mdms-service/health\" }}" - readinessProbePath: "{{ printf \"%s/health\" .Values.envContext | default \"/egov-mdms-service/health\" }}" + livenessProbePath: "{{ printf \"%s/health\" .Values.ingress.context | default \"/egov-mdms-service/health\" }}" + livenessProbePath: "{{ printf \"%s/health\" .Values.ingress.context | default \"/egov-mdms-service/health\" }}" appType: "java-spring" tracing-enabled: true @@ -40,9 +40,9 @@ egov-mdms-data-save-topic: "save-mdms-data" # Additional Container Envs env: | - name: SERVER_CONTEXT_PATH - value: {{ printf "/%s" .Values.envContext | default "/egov-mdms-service" }} + value: {{ printf "/%s" .Values.ingress.context | default "/egov-mdms-service" }} - name: SERVER_SERVLET_CONTEXT_PATH - value: {{ printf "/%s" .Values.envContext | default "/egov-mdms-service" }} + value: {{ printf "/%s" .Values.ingress.context | default "/egov-mdms-service" }} - name: SPRING_KAFKA_CONSUMER_GROUP_ID value: egov-mdms-service-consumer-group - name: SPRING_KAFKA_PRODUCER_KEY_SERIALIZER From 6746eb1248046455e1f70c2fffafaafe8a18e1b4 Mon Sep 17 00:00:00 2001 From: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> Date: Mon, 23 Sep 2024 14:20:31 +0530 Subject: [PATCH 08/18] updated values of mdms --- .../helm/charts/health-services/health-mdms-v2/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy-as-code/helm/charts/health-services/health-mdms-v2/values.yaml b/deploy-as-code/helm/charts/health-services/health-mdms-v2/values.yaml index c2df0e4825..10508845a5 100644 --- a/deploy-as-code/helm/charts/health-services/health-mdms-v2/values.yaml +++ b/deploy-as-code/helm/charts/health-services/health-mdms-v2/values.yaml @@ -27,7 +27,7 @@ replicas: "1" healthChecks: enabled: true livenessProbePath: "{{ printf \"%s/health\" .Values.ingress.context | default \"/egov-mdms-service/health\" }}" - livenessProbePath: "{{ printf \"%s/health\" .Values.ingress.context | default \"/egov-mdms-service/health\" }}" + readinessProbePath: "{{ printf \"%s/health\" .Values.ingress.context | default \"/egov-mdms-service/health\" }}" appType: "java-spring" tracing-enabled: true From b11b34b42f79644239a1509565c659043bf13289 Mon Sep 17 00:00:00 2001 From: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> Date: Mon, 23 Sep 2024 15:15:45 +0530 Subject: [PATCH 09/18] check deployment of mdmsv2 (#3069) --- .../charts/health-services/health-mdms-v2/values.yaml | 10 +++++----- .../helm/environments/unified-health-uat.yaml | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/deploy-as-code/helm/charts/health-services/health-mdms-v2/values.yaml b/deploy-as-code/helm/charts/health-services/health-mdms-v2/values.yaml index 10508845a5..b0ccdb700c 100644 --- a/deploy-as-code/helm/charts/health-services/health-mdms-v2/values.yaml +++ b/deploy-as-code/helm/charts/health-services/health-mdms-v2/values.yaml @@ -10,7 +10,7 @@ ingress: namespace: egov enabled: true zuul: true - context: {{ .Values.envContext | default "egov-mdms-service" }} + context: mdms-v2 initContainers: @@ -26,8 +26,8 @@ image: replicas: "1" healthChecks: enabled: true - livenessProbePath: "{{ printf \"%s/health\" .Values.ingress.context | default \"/egov-mdms-service/health\" }}" - readinessProbePath: "{{ printf \"%s/health\" .Values.ingress.context | default \"/egov-mdms-service/health\" }}" + livenessProbePath: "/" + readinessProbePath: "/" appType: "java-spring" tracing-enabled: true @@ -40,9 +40,9 @@ egov-mdms-data-save-topic: "save-mdms-data" # Additional Container Envs env: | - name: SERVER_CONTEXT_PATH - value: {{ printf "/%s" .Values.ingress.context | default "/egov-mdms-service" }} + value: {{ .Values.contextPath | default "mdms-v2" }} - name: SERVER_SERVLET_CONTEXT_PATH - value: {{ printf "/%s" .Values.ingress.context | default "/egov-mdms-service" }} + value: {{ .Values.contextPath | default "mdms-v2" }} - name: SPRING_KAFKA_CONSUMER_GROUP_ID value: egov-mdms-service-consumer-group - name: SPRING_KAFKA_PRODUCER_KEY_SERIALIZER diff --git a/deploy-as-code/helm/environments/unified-health-uat.yaml b/deploy-as-code/helm/environments/unified-health-uat.yaml index 02834e0e4b..2b4e009c61 100644 --- a/deploy-as-code/helm/environments/unified-health-uat.yaml +++ b/deploy-as-code/helm/environments/unified-health-uat.yaml @@ -222,7 +222,9 @@ egov-idgen: health-mdms-v2: memory_limits: 512Mi - envContext: "egov-mdms-service" + contextPath: "egov-mdms-service" + ingress: + context: "egov-mdms-service" egov-notification-sms: sms-provider-url: "sms provider url" ## Add sms provider url From a28c34bdfa356150924397efae6a2acb60754b75 Mon Sep 17 00:00:00 2001 From: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> Date: Mon, 23 Sep 2024 15:19:05 +0530 Subject: [PATCH 10/18] Update unified-health-uat.yaml --- deploy-as-code/helm/environments/unified-health-uat.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy-as-code/helm/environments/unified-health-uat.yaml b/deploy-as-code/helm/environments/unified-health-uat.yaml index 2b4e009c61..1864526f18 100644 --- a/deploy-as-code/helm/environments/unified-health-uat.yaml +++ b/deploy-as-code/helm/environments/unified-health-uat.yaml @@ -222,7 +222,7 @@ egov-idgen: health-mdms-v2: memory_limits: 512Mi - contextPath: "egov-mdms-service" + contextPath: "/egov-mdms-service" ingress: context: "egov-mdms-service" From 8d3790c114a371eaaacbd86321376b070c94c82b Mon Sep 17 00:00:00 2001 From: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> Date: Mon, 23 Sep 2024 15:35:21 +0530 Subject: [PATCH 11/18] modified mdms v2 to act directly as egov-mdms-service --- .../helm/charts/core-services/mdms-v2/values.yaml | 8 +++++--- deploy-as-code/helm/environments/sanitation-uat.yaml | 2 +- deploy-as-code/helm/environments/unified-health-uat.yaml | 4 ++-- deploy-as-code/helm/environments/unified-uat.yaml | 5 ++++- deploy-as-code/helm/environments/unified-urban-uat.yaml | 2 +- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/deploy-as-code/helm/charts/core-services/mdms-v2/values.yaml b/deploy-as-code/helm/charts/core-services/mdms-v2/values.yaml index 1c5b3b1eb1..6c84236ad0 100644 --- a/deploy-as-code/helm/charts/core-services/mdms-v2/values.yaml +++ b/deploy-as-code/helm/charts/core-services/mdms-v2/values.yaml @@ -22,8 +22,8 @@ image: replicas: "1" healthChecks: enabled: true - livenessProbePath: "/mdms-v2/health" - readinessProbePath: "/mdms-v2/health" + livenessProbePath: "/" + readinessProbePath: "/" appType: "java-spring" tracing-enabled: true memory_limits: 512Mi @@ -37,7 +37,9 @@ cpu_limits: "200m" # Additional Container Envs env: | - name: SERVER_CONTEXT_PATH - value: /mdms-v2 + value: {{ .Values.contextPath | default "mdms-v2" }} + - name: SERVER_SERVLET_CONTEXT_PATH + value: {{ .Values.contextPath | default "mdms-v2" }} - name: SPRING_KAFKA_CONSUMER_GROUP_ID value: egov-mdms-service-consumer-group - name: SPRING_KAFKA_PRODUCER_KEY_SERIALIZER diff --git a/deploy-as-code/helm/environments/sanitation-uat.yaml b/deploy-as-code/helm/environments/sanitation-uat.yaml index 34a2640a68..e6ddf82775 100644 --- a/deploy-as-code/helm/environments/sanitation-uat.yaml +++ b/deploy-as-code/helm/environments/sanitation-uat.yaml @@ -72,7 +72,7 @@ cluster-configs: egov-idgen: "http://egov-idgen.egov:8080/" egov-otp: "http://egov-otp.egov:8080/" egov-common-workflows: "http://egov-common-workflows:8080/" - egov-mdms-service: "http://health-mdms-v2.health:8080/" + egov-mdms-service: "http://mdms-v2.egov:8080/" egov-mdms-service-test: "http://egov-mdms-service-test:8080/" egov-mdms-create: "http://egov-mdms-create:8080/" egov-eis: "http://egov-eis:8080/" diff --git a/deploy-as-code/helm/environments/unified-health-uat.yaml b/deploy-as-code/helm/environments/unified-health-uat.yaml index 1864526f18..6405b8a70d 100644 --- a/deploy-as-code/helm/environments/unified-health-uat.yaml +++ b/deploy-as-code/helm/environments/unified-health-uat.yaml @@ -80,7 +80,7 @@ cluster-configs: egov-otp: 'http://egov-otp.egov:8080/' egov-common-workflows: 'http://egov-common-workflows:8080/' mdms-service-v2: 'http://mdms-v2.egov:8080/' - egov-mdms-service: "http://health-mdms-v2.health:8080/" + egov-mdms-service: "http://mdms-v2.egov:8080/" egov-mdms-service-legacy: "http://health-mdms-v1.health:8080/" egov-mdms-service-test: "http://egov-mdms-service-test.egov:8080/" egov-mdms-create: "http://egov-mdms-create.health:8080/" @@ -568,7 +568,7 @@ project-factory: minReplicas: 1 maxReplicas: 5 namespace: 'health' - mdmsV2SearchEndpoint: 'mdms-v2/v2/_search' + mdmsV2SearchEndpoint: 'egov-mdms-service/v2/_search' mdmsV1SearchEndpoint: 'egov-mdms-service/v1/_search' enableDynamicTemplate: '' CallGenerateWhenDeliveryConditionsDiffer: 'false' diff --git a/deploy-as-code/helm/environments/unified-uat.yaml b/deploy-as-code/helm/environments/unified-uat.yaml index 06861a7850..58bfdd1a7c 100644 --- a/deploy-as-code/helm/environments/unified-uat.yaml +++ b/deploy-as-code/helm/environments/unified-uat.yaml @@ -74,7 +74,7 @@ cluster-configs: egov-idgen: "http://egov-idgen.egov:8080/" egov-otp: "http://egov-otp.egov:8080/" egov-common-workflows: "http://egov-common-workflows:8080/" - egov-mdms-service: "http://health-mdms-v2.health:8080/" + egov-mdms-service: "http://mdms-v2.egov:8080/" egov-mdms-service-legacy: "http://health-mdms-v1.health:8080/" egov-mdms-service-test: "http://egov-mdms-service-test:8080/" egov-mdms-create: "http://egov-mdms-create:8080/" @@ -607,6 +607,9 @@ mdms-v2: replicas: 1 memory_limits: 768Mi heap: '-Xmx768m -Xms512m' + contextPath: "/egov-mdms-service" + ingress: + context: "egov-mdms-service" # <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< diff --git a/deploy-as-code/helm/environments/unified-urban-uat.yaml b/deploy-as-code/helm/environments/unified-urban-uat.yaml index 08e293a48b..9ed1027aed 100644 --- a/deploy-as-code/helm/environments/unified-urban-uat.yaml +++ b/deploy-as-code/helm/environments/unified-urban-uat.yaml @@ -73,7 +73,7 @@ cluster-configs: egov-idgen: "http://egov-idgen.egov:8080/" egov-otp: "http://egov-otp.egov:8080/" egov-common-workflows: "http://egov-common-workflows:8080/" - egov-mdms-service: "http://health-mdms-v2.health:8080/ " + egov-mdms-service: "http://mdms-v2.egov:8080/" egov-mdms-service-test: "http://egov-mdms-service-test:8080/" egov-mdms-create: "http://egov-mdms-create:8080/" egov-eis: "http://egov-eis:8080/" From 4c7c41d6f9123a6f1edb6588e7e2a7fa2eba5ec0 Mon Sep 17 00:00:00 2001 From: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> Date: Mon, 23 Sep 2024 15:50:25 +0530 Subject: [PATCH 12/18] added health checks --- deploy-as-code/helm/charts/core-services/mdms-v2/values.yaml | 4 ++-- deploy-as-code/helm/environments/unified-uat.yaml | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/deploy-as-code/helm/charts/core-services/mdms-v2/values.yaml b/deploy-as-code/helm/charts/core-services/mdms-v2/values.yaml index 6c84236ad0..42dd960a00 100644 --- a/deploy-as-code/helm/charts/core-services/mdms-v2/values.yaml +++ b/deploy-as-code/helm/charts/core-services/mdms-v2/values.yaml @@ -22,8 +22,8 @@ image: replicas: "1" healthChecks: enabled: true - livenessProbePath: "/" - readinessProbePath: "/" + livenessProbePath: "/mdms-v2/health" + readinessProbePath: "/mdms-v2/health" appType: "java-spring" tracing-enabled: true memory_limits: 512Mi diff --git a/deploy-as-code/helm/environments/unified-uat.yaml b/deploy-as-code/helm/environments/unified-uat.yaml index 58bfdd1a7c..5d3f799131 100644 --- a/deploy-as-code/helm/environments/unified-uat.yaml +++ b/deploy-as-code/helm/environments/unified-uat.yaml @@ -610,6 +610,9 @@ mdms-v2: contextPath: "/egov-mdms-service" ingress: context: "egov-mdms-service" + healthChecks: + livenessProbePath: "/egov-mdms-service/health" + readinessProbePath: "/egov-mdms-service/health" # <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< From 63ff1062bc6b81173d82e5f796d4430826c679a2 Mon Sep 17 00:00:00 2001 From: ashish-egov <137176738+ashish-egov@users.noreply.github.com> Date: Mon, 23 Sep 2024 18:05:07 +0530 Subject: [PATCH 13/18] Updated the mdms white listing path in unified-uat.yaml (#3075) --- deploy-as-code/helm/environments/unified-uat.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy-as-code/helm/environments/unified-uat.yaml b/deploy-as-code/helm/environments/unified-uat.yaml index 5d3f799131..4248ed6f0e 100644 --- a/deploy-as-code/helm/environments/unified-uat.yaml +++ b/deploy-as-code/helm/environments/unified-uat.yaml @@ -526,7 +526,7 @@ zuul: heap: "-Xmx704m -Xms512m" server-tomcat-max-threads: "350" server-tomcat-max-connections: "1500" - egov-open-endpoints-whitelist: "/user/oauth/token,/user-otp/v1/_send,/otp/v1/_validate,/user/citizen/_create,/localization/messages,/localization/messages/v1/_search,/user/password/nologin/_update,/pgr/servicedefinition/v1/_search,/pgr/servicecategories/v1/_search,/pgr/v1/otp/_send,/pgr-master/receivingmode/v1/_search,/tenant/v1/tenant/_search,/egov-location/boundarys,/egov-location/boundarys/boundariesByBndryTypeNameAndHierarchyTypeName,/pgr-master/service/v1/_search,/egov-location/boundarys/getLocationByLocationName,/pgr-master/OTPConfig/_search,/pgr-master/serviceGroup/v1/_search,/egov-location/boundarys/isshapefileexist,/pgr/services/v1/_search,/hr-masters/hrconfigurations/_search,/collection-services/receipts/_view,/pgr-master/service/v2/_search,/pgr-master/servicedefinition/v1/_search,/citizen-services,/citizen-services/v1/requests/receipt/_create,/citizen-services/v1/pgresponse,/citizen-services/v1/requests/anonymous/_search,/egov-mdms-service/v1/_search,/egov-mdms-service/v1/_get,/egov-mdms-service/v1/_reload,/egov-mdms-service/v1/_reloadobj,/egov-location/boundarys/getshapefile,/egov-indexer/index-operations/_index,/egov-indexer/index-operations/_reload,/egov-mdms-service-test/v1/_search,/egov-mdms-create/v1/_update,/egov-mdms-create/v1/_create,/egov-mdms-service-test/v1/_reload,/filestore/v1/files/url,/egov-url-shortening,/whatsapp-webhook/messages,/edcr/rest/dcr/downloadfile,/dashboard-ingest/ingest/upload,/egov-searcher/water-services/wateropensearch/_get,/egov-searcher/sewerage-services/sewerageopensearch/_get,/xstate-chatbot/status,/xstate-chatbot/reminder,/nlp-engine/fuzzy/city,/nlp-engine/fuzzy/locality,/egov-mdms-service-legacy/v1/_search,/mdms-v2/schema/v1/_search,/mdms-v2/v2/_search,/health-project/staff/v1/_search" + egov-open-endpoints-whitelist: "/user/oauth/token,/user-otp/v1/_send,/otp/v1/_validate,/user/citizen/_create,/localization/messages,/localization/messages/v1/_search,/user/password/nologin/_update,/pgr/servicedefinition/v1/_search,/pgr/servicecategories/v1/_search,/pgr/v1/otp/_send,/pgr-master/receivingmode/v1/_search,/tenant/v1/tenant/_search,/egov-location/boundarys,/egov-location/boundarys/boundariesByBndryTypeNameAndHierarchyTypeName,/pgr-master/service/v1/_search,/egov-location/boundarys/getLocationByLocationName,/pgr-master/OTPConfig/_search,/pgr-master/serviceGroup/v1/_search,/egov-location/boundarys/isshapefileexist,/pgr/services/v1/_search,/hr-masters/hrconfigurations/_search,/collection-services/receipts/_view,/pgr-master/service/v2/_search,/pgr-master/servicedefinition/v1/_search,/citizen-services,/citizen-services/v1/requests/receipt/_create,/citizen-services/v1/pgresponse,/citizen-services/v1/requests/anonymous/_search,/egov-mdms-service/v1/_search,/egov-mdms-service/v1/_get,/egov-mdms-service/v1/_reload,/egov-mdms-service/v1/_reloadobj,/egov-location/boundarys/getshapefile,/egov-indexer/index-operations/_index,/egov-indexer/index-operations/_reload,/egov-mdms-service-test/v1/_search,/egov-mdms-create/v1/_update,/egov-mdms-create/v1/_create,/egov-mdms-service-test/v1/_reload,/filestore/v1/files/url,/egov-url-shortening,/whatsapp-webhook/messages,/edcr/rest/dcr/downloadfile,/dashboard-ingest/ingest/upload,/egov-searcher/water-services/wateropensearch/_get,/egov-searcher/sewerage-services/sewerageopensearch/_get,/xstate-chatbot/status,/xstate-chatbot/reminder,/nlp-engine/fuzzy/city,/nlp-engine/fuzzy/locality,/egov-mdms-service-legacy/v1/_search,/mdms-v2/schema/v1/_search,/mdms-v2/v2/_search,/health-project/staff/v1/_search,/egov-mdms-service/schema/v1/_search,/egov-mdms-service/v2/_search" egov-mixed-mode-endpoints-whitelist: "/pgr/seva/v1/_create,/pgr/seva/v1/_search,/pgr/seva/v1/_count,/workflow/history/v1/_search,/filestore/v1/files/id,/filestore/v1/files,/filestore/v1/files/tag,/egov-common-masters/departments/_search,/pt-property/property/propertytypes/_search,/pt-property/properties/_search,/pt-property/property/usages/_search,/egov-idgen/id/_generate,/egf-masters/financialyears/_search,/egov-common-workflows/process/_start,/egov-common-workflows/process/_search,/egov-common-workflows/tasks,/egov-common-workflows/tasks/{id}/_update,/user/_search,/billing-service/demand/_dues,/billing-service/bill/_generate,/billing-service/demand/_create,/wcms/masters/waterchargesconfig/_search,/wcms/masters/usagetypes/_search,/wcms/masters/pipesizes/_search,/wcms-connection/connection/_getbillingtypes,/wcms-connection/connection/_getconnectiontypes,/wcms/masters/sourcetypes/_search,/wcms/masters/supplytypes/_search,/wcms/masters/storagereservoirs/_search,/wcms/masters/treatmentplants/_search,/wcms/masters/documenttypes-applicationtypes/_search,/wcms/masters/donations/_search,/wcms/masters/nonmeterwaterrates/_search,/wcms-connection/connection/_create,/egov-common-masters/genders/_search,/egov-common-workflows/designations/_search,/access/v1/actions/mdms/_get,/tl-services/v1/BPAREG/_create,/tl-services/v1/BPAREG/_update,/tl-calculator/v1/BPAREG/_getbill,/property-services/property/_search,/billing-service/bill/v2/_search,/egov-location/location/v11/boundarys/_search,/pg-service/transaction/v1/_create,/collection-services/payments/_search,/pdf-service/v1/_create,/billing-service/bill/v2/_fetchbill,/pg-service/transaction/v1/_update,/ws-services/wc/_search,/sw-services/swc/_search,/edcr/rest/dcr/scrutinydetails,/edcr/rest/dcr/occomparison,/egov-pdf/download/PAYMENT/consolidatedreceipt,/collection-services/payments/PT/_search,/collection-services/payments/WS/_search,/collection-services/payments/SW/_search,/collection-services/payments/WS.ONE_TIME_FEE/_search,/collection-services/payments/SW.ONE_TIME_FEE/_search,/turn-io-adapter/_transform,/egov-user-event/v1/events/_search" # <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< From 2e5b0fe3984c105bd994260ea3d4d894fbc08df5 Mon Sep 17 00:00:00 2001 From: yashita-egov Date: Mon, 23 Sep 2024 18:24:38 +0530 Subject: [PATCH 14/18] HCMPRE-634: added hrms enpoint in urban pgr-service helm chart (#3076) --- deploy-as-code/helm/charts/urban/pgr-services/values.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/deploy-as-code/helm/charts/urban/pgr-services/values.yaml b/deploy-as-code/helm/charts/urban/pgr-services/values.yaml index d7e27081b6..2a22c8feb8 100644 --- a/deploy-as-code/helm/charts/urban/pgr-services/values.yaml +++ b/deploy-as-code/helm/charts/urban/pgr-services/values.yaml @@ -40,6 +40,7 @@ notification-allowed-status: "open,assigned,rejected,resolved" heap: "-Xmx192m -Xms192m" java-args: "-Dspring.profiles.active=monitoring" + # Additional Container Envs env: | - name: SPRING_KAFKA_CONSUMER_GROUP_ID @@ -140,6 +141,8 @@ env: | configMapKeyRef: name: egov-service-host key: egov-location + - name: EGOV_HRMS_SEARCH_ENDPOINT + value: "/health-hrms/employees/_search" - name: EGOV_USR_EVENTS_NOTIFICATION_ENABLED value: "true" - name: EGOV_USR_EVENTS_CREATE_TOPIC From 019a41ec59e18e06a5ab97b4a0ee47380b660611 Mon Sep 17 00:00:00 2001 From: manastanmay-eGov <118505430+manastanmay-eGov@users.noreply.github.com> Date: Tue, 24 Sep 2024 17:12:21 +0530 Subject: [PATCH 15/18] Updated the mdms host for CBO migration (#3077) --- deploy-as-code/helm/environments/unified-works-qa.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy-as-code/helm/environments/unified-works-qa.yaml b/deploy-as-code/helm/environments/unified-works-qa.yaml index 34f5951125..009202260c 100644 --- a/deploy-as-code/helm/environments/unified-works-qa.yaml +++ b/deploy-as-code/helm/environments/unified-works-qa.yaml @@ -76,7 +76,7 @@ cluster-configs: egov-mdms-service: "http://egov-mdms-service.egov:8080/" egov-mdms-service-test: "http://egov-mdms-service-test:8080/" egov-mdms-create: "http://egov-mdms-create:8080/" - egov-mdms-service-v2: "http://mdms-v2.egov:8080/" + egov-mdms-service-v2: "http://egov-mdms-service.egov:8080/" egov-eis: "http://egov-eis:8080/" egov-workflow: "http://egov-workflow.egov:8080/" egov-workflow-v2: "http://egov-workflow-v2.egov:8080/" From 76e45da4765b295cda785452f78aa6d3decf8d2f Mon Sep 17 00:00:00 2001 From: prerna-egov <137176760+prerna-egov@users.noreply.github.com> Date: Tue, 24 Sep 2024 17:44:59 +0530 Subject: [PATCH 16/18] added attendance indexer config to indexer file path (#3078) --- deploy-as-code/helm/environments/unified-qa.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy-as-code/helm/environments/unified-qa.yaml b/deploy-as-code/helm/environments/unified-qa.yaml index 31104a6973..531075817c 100644 --- a/deploy-as-code/helm/environments/unified-qa.yaml +++ b/deploy-as-code/helm/environments/unified-qa.yaml @@ -372,7 +372,7 @@ egov-indexer: gitSync: repo: "git@github.com:egovernments/configs" ##### Change repo url with Your fork Repo url branch: "UNIFIED-QA" ##### Change repo branch with Your fork Repo branch - egov-indexer-yaml-repo-path: "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/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/works/egov-indexer/measurement-indexer.yml,file:///work-dir/configs/works/egov-indexer/project-indexer.yml,file:///work-dir/configs/works/egov-indexer/organisationservices-indexer.yml,file:///work-dir/configs/works/egov-indexer/contractservices-indexer.yml,file:///work-dir/configs/works/egov-indexer/estimateservices-indexer.yml,file:///work-dir/configs/works/egov-indexer/expensebill-indexer.yml,file:///work-dir/configs/works/egov-indexer/individual-indexer.yml,file:///work-dir/configs/works/egov-indexer/musterservices-indexer.yml,file:///work-dir/configs/sanitation/egov-indexer/pqm-service-indexer.yml,file:///work-dir/configs/sanitation/egov-indexer/egov-pqm-service.yml,file:///work-dir/configs/sanitation/egov-indexer/pqm-anomaly-finder-indexer.yml,file:///work-dir/configs/sanitation/egov-indexer/egov-fsm.yaml,file:///work-dir/configs/sanitation/egov-indexer/egov-vehicle.yaml,file:///work-dir/configs/sanitation/egov-indexer/egov-vendor.yaml,file:///work-dir/configs/sanitation/egov-indexer/fsm-inbox-indexer.yml,file:///work-dir/configs/egov-indexer/sample.yml,file:///work-dir/configs/egov-indexer/facility-indexer.yml,file:///work-dir/configs/egov-indexer/household-indexer.yml,file:///work-dir/configs/health/egov-indexer/household-member-indexer.yml,file:///work-dir/configs/health/egov-indexer/household-indexer.yml,file:///work-dir/configs/egov-indexer/individual-indexer.yml,file:///work-dir/configs/egov-indexer/project-indexer.yml,file:///work-dir/configs/egov-indexer/project-staff-indexer.yml,file:///work-dir/configs/egov-indexer/project-task-indexer.yml,file:///work-dir/configs/egov-indexer/referral-management-indexer.yml,file:///work-dir/configs/egov-indexer/stock-indexer.yml,file:///work-dir/configs/health/egov-indexer/facility-indexer.yml,file:///work-dir/configs/health/egov-indexer/household-indexer.yml,file:///work-dir/configs/health/egov-indexer/individual-indexer.yml,file:///work-dir/configs/health/egov-indexer/project-indexer.yml,file:///work-dir/configs/health/egov-indexer/project-staff-indexer.yml,file:///work-dir/configs/health/egov-indexer/project-task-indexer.yml,file:///work-dir/configs/health/egov-indexer/referral-management-indexer.yml,file:///work-dir/configs/health/egov-indexer/stock-indexer.yml,file:///work-dir/configs/egov-indexer/pgr-services.yml,file:///work-dir/configs/egov-indexer/mukta-contractservices-indexer.yml,file:///work-dir/configs/egov-indexer/mukta-estimateservices-indexer.yml,file:///work-dir/configs/egov-indexer/mukta-expensebill-indexer.yml,file:///work-dir/configs/egov-indexer/mukta-individual-indexer.yml,file:///work-dir/configs/ifix/egov-indexer/digit-exchange-indexer.yml,file:///work-dir/configs/works/egov-indexer/mukta-pi-indexer.yml, file:///work-dir/configs/works/egov-indexer/ifms-pi-indexer.yml,file:///work-dir/configs/health/egov-indexer/transformer-pgr-services.yml,file:///work-dir/configs/egov-indexer/service-request-indexer.yml,file:///work-dir/configs/health/egov-indexer/pgr-services.yml" + egov-indexer-yaml-repo-path: "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/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/works/egov-indexer/measurement-indexer.yml,file:///work-dir/configs/works/egov-indexer/project-indexer.yml,file:///work-dir/configs/works/egov-indexer/organisationservices-indexer.yml,file:///work-dir/configs/works/egov-indexer/contractservices-indexer.yml,file:///work-dir/configs/works/egov-indexer/estimateservices-indexer.yml,file:///work-dir/configs/works/egov-indexer/expensebill-indexer.yml,file:///work-dir/configs/works/egov-indexer/individual-indexer.yml,file:///work-dir/configs/works/egov-indexer/musterservices-indexer.yml,file:///work-dir/configs/sanitation/egov-indexer/pqm-service-indexer.yml,file:///work-dir/configs/sanitation/egov-indexer/egov-pqm-service.yml,file:///work-dir/configs/sanitation/egov-indexer/pqm-anomaly-finder-indexer.yml,file:///work-dir/configs/sanitation/egov-indexer/egov-fsm.yaml,file:///work-dir/configs/sanitation/egov-indexer/egov-vehicle.yaml,file:///work-dir/configs/sanitation/egov-indexer/egov-vendor.yaml,file:///work-dir/configs/sanitation/egov-indexer/fsm-inbox-indexer.yml,file:///work-dir/configs/egov-indexer/sample.yml,file:///work-dir/configs/egov-indexer/facility-indexer.yml,file:///work-dir/configs/egov-indexer/household-indexer.yml,file:///work-dir/configs/health/egov-indexer/household-member-indexer.yml,file:///work-dir/configs/health/egov-indexer/household-indexer.yml,file:///work-dir/configs/egov-indexer/individual-indexer.yml,file:///work-dir/configs/egov-indexer/project-indexer.yml,file:///work-dir/configs/egov-indexer/project-staff-indexer.yml,file:///work-dir/configs/egov-indexer/project-task-indexer.yml,file:///work-dir/configs/egov-indexer/referral-management-indexer.yml,file:///work-dir/configs/egov-indexer/stock-indexer.yml,file:///work-dir/configs/health/egov-indexer/facility-indexer.yml,file:///work-dir/configs/health/egov-indexer/household-indexer.yml,file:///work-dir/configs/health/egov-indexer/individual-indexer.yml,file:///work-dir/configs/health/egov-indexer/project-indexer.yml,file:///work-dir/configs/health/egov-indexer/project-staff-indexer.yml,file:///work-dir/configs/health/egov-indexer/project-task-indexer.yml,file:///work-dir/configs/health/egov-indexer/referral-management-indexer.yml,file:///work-dir/configs/health/egov-indexer/stock-indexer.yml,file:///work-dir/configs/egov-indexer/pgr-services.yml,file:///work-dir/configs/egov-indexer/mukta-contractservices-indexer.yml,file:///work-dir/configs/egov-indexer/mukta-estimateservices-indexer.yml,file:///work-dir/configs/egov-indexer/mukta-expensebill-indexer.yml,file:///work-dir/configs/egov-indexer/mukta-individual-indexer.yml,file:///work-dir/configs/ifix/egov-indexer/digit-exchange-indexer.yml,file:///work-dir/configs/works/egov-indexer/mukta-pi-indexer.yml, file:///work-dir/configs/works/egov-indexer/ifms-pi-indexer.yml,file:///work-dir/configs/health/egov-indexer/transformer-pgr-services.yml,file:///work-dir/configs/egov-indexer/service-request-indexer.yml,file:///work-dir/configs/health/egov-indexer/pgr-services.yml,file:///work-dir/configs/health/egov-indexer/attendance-service-indexer.yml" egov-persister: replicas: 1 images: From 0fd2f0f7744ef0f93909caaf81c1a6716d6ef710 Mon Sep 17 00:00:00 2001 From: manastanmay-eGov <118505430+manastanmay-eGov@users.noreply.github.com> Date: Wed, 25 Sep 2024 12:00:03 +0530 Subject: [PATCH 17/18] Udpated mdms v2 url (#3079) --- deploy-as-code/helm/environments/unified-works-qa.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy-as-code/helm/environments/unified-works-qa.yaml b/deploy-as-code/helm/environments/unified-works-qa.yaml index 009202260c..34f5951125 100644 --- a/deploy-as-code/helm/environments/unified-works-qa.yaml +++ b/deploy-as-code/helm/environments/unified-works-qa.yaml @@ -76,7 +76,7 @@ cluster-configs: egov-mdms-service: "http://egov-mdms-service.egov:8080/" egov-mdms-service-test: "http://egov-mdms-service-test:8080/" egov-mdms-create: "http://egov-mdms-create:8080/" - egov-mdms-service-v2: "http://egov-mdms-service.egov:8080/" + egov-mdms-service-v2: "http://mdms-v2.egov:8080/" egov-eis: "http://egov-eis:8080/" egov-workflow: "http://egov-workflow.egov:8080/" egov-workflow-v2: "http://egov-workflow-v2.egov:8080/" From 3fa473ffb24146a3ebb7281f0572b3ef77e79980 Mon Sep 17 00:00:00 2001 From: Palak Garg <86659286+palak-egov@users.noreply.github.com> Date: Wed, 25 Sep 2024 14:05:47 +0530 Subject: [PATCH 18/18] refactor resource-estimation to resource-generator --- .../resource-estimation-service/Chart.yaml | 2 +- .../resource-estimation-service/values.yaml | 12 ++++++------ .../helm/environments/unified-health-dev.yaml | 2 +- .../helm/environments/unified-health-qa.yaml | 2 +- .../helm/environments/unified-health-uat.yaml | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/deploy-as-code/helm/charts/health-services/resource-estimation-service/Chart.yaml b/deploy-as-code/helm/charts/health-services/resource-estimation-service/Chart.yaml index c45d737e77..3db7169ddf 100644 --- a/deploy-as-code/helm/charts/health-services/resource-estimation-service/Chart.yaml +++ b/deploy-as-code/helm/charts/health-services/resource-estimation-service/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -name: resource-estimation-service +name: resource-generator description: A Helm chart for Kubernetes # A chart can be either an 'application' or a 'library' chart. diff --git a/deploy-as-code/helm/charts/health-services/resource-estimation-service/values.yaml b/deploy-as-code/helm/charts/health-services/resource-estimation-service/values.yaml index 8042f2ce21..aac61cf129 100644 --- a/deploy-as-code/helm/charts/health-services/resource-estimation-service/values.yaml +++ b/deploy-as-code/helm/charts/health-services/resource-estimation-service/values.yaml @@ -1,6 +1,6 @@ # Common Labels labels: - app: "resource-estimation-service" + app: "resource-generator" group: "health" namespace: health @@ -10,16 +10,16 @@ ingress: namespace: egov enabled: false zuul: false - context: "resource-estimation-service" + context: "resource-generator" # Container Configs image: - repository: "resource-estimation-service" + repository: "resource-generator" replicas: "1" healthChecks: enabled: true - livenessProbePath: "/resource-estimation-service/health" - readinessProbePath: "/resource-estimation-service/health" + livenessProbePath: "/resource-generator/health" + readinessProbePath: "/resource-generator/health" appType: "java-spring" tracing-enabled: true memory_limits: 512Mi @@ -31,7 +31,7 @@ egov-mdms-service-endpoint-key: "/mdms-v2/v1/_search" # Additional Container Envs env: | - name: SPRING_KAFKA_CONSUMER_GROUP_ID - value: resource-estimation-service + value: resource-generator - name: SPRING_KAFKA_PRODUCER_KEY_SERIALIZER value: org.apache.kafka.common.serialization.StringSerializer {{- if index .Values "global" "tracer-errors-provideexceptionindetails" }} diff --git a/deploy-as-code/helm/environments/unified-health-dev.yaml b/deploy-as-code/helm/environments/unified-health-dev.yaml index 8f9ee02510..256fb9ed4d 100644 --- a/deploy-as-code/helm/environments/unified-health-dev.yaml +++ b/deploy-as-code/helm/environments/unified-health-dev.yaml @@ -593,7 +593,7 @@ plan-service: egov-mdms-service-v2-endpoint-key: "/mdms-v2/v2/_search" -resource-estimation-service: +resource-generator: egov-mdms-service-host-key: 'mdms-service-v2' egov-mdms-service-endpoint-key: "/mdms-v2/v1/_search" diff --git a/deploy-as-code/helm/environments/unified-health-qa.yaml b/deploy-as-code/helm/environments/unified-health-qa.yaml index 31eb62c6d4..712d7af047 100644 --- a/deploy-as-code/helm/environments/unified-health-qa.yaml +++ b/deploy-as-code/helm/environments/unified-health-qa.yaml @@ -578,7 +578,7 @@ plan-service: egov-mdms-service-endpoint-key: "/mdms-v2/v1/_search" -resource-estimation-service: +resource-generator: egov-mdms-service-host-key: 'mdms-service-v2' egov-mdms-service-endpoint-key: "/mdms-v2/v1/_search" diff --git a/deploy-as-code/helm/environments/unified-health-uat.yaml b/deploy-as-code/helm/environments/unified-health-uat.yaml index 6405b8a70d..ba262a7f87 100644 --- a/deploy-as-code/helm/environments/unified-health-uat.yaml +++ b/deploy-as-code/helm/environments/unified-health-uat.yaml @@ -580,7 +580,7 @@ plan-service: egov-mdms-service-endpoint-key: "/mdms-v2/v1/_search" -resource-estimation-service: +resource-generator: egov-mdms-service-host-key: 'mdms-service-v2' egov-mdms-service-endpoint-key: "/mdms-v2/v1/_search"