Hcmpre 658

deploy-as-code/helm/charts/core-services/mdms-v2/values.yaml

@@ -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

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: mdms-v2
+
 
 initContainers:
   dbMigration:
@@ -25,8 +26,8 @@ image:
 replicas: "1"
 healthChecks:
   enabled: true
-  livenessProbePath: "/egov-mdms-service/health"
-  readinessProbePath: "/egov-mdms-service/health"
+  livenessProbePath: "/"
+  readinessProbePath: "/"
 
 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: {{ .Values.contextPath | default "mdms-v2" }} 
   - name: SERVER_SERVLET_CONTEXT_PATH
-    value: /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

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

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"
 

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.

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" }}

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

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/"

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"
 

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"
+resource-generator:
+  egov-mdms-service-host-key: 'mdms-service-v2'
+  egov-mdms-service-endpoint-key: "/mdms-v2/v1/_search"
 
 # <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 

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/"
@@ -222,6 +222,9 @@ egov-idgen:
 
 health-mdms-v2:
   memory_limits: 512Mi
+  contextPath: "/egov-mdms-service"
+  ingress:
+    context: "egov-mdms-service"
 
 egov-notification-sms:
   sms-provider-url: "sms provider url" ## Add sms provider url
@@ -565,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'
@@ -577,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"
 

deploy-as-code/helm/environments/unified-qa.yaml

@@ -372,7 +372,7 @@ egov-indexer:
     gitSync:
       repo: "[email protected]: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,file:///work-dir/configs/health/egov-indexer/attendance-service-indexer.yml"
 egov-persister:
   replicas: 1
   images: