From a97b95838d4414bdb0adb147685051bf90a27f96 Mon Sep 17 00:00:00 2001 From: palak-egov Date: Wed, 20 Nov 2024 17:11:54 +0530 Subject: [PATCH 1/7] merge LTS-upgrade --- .../collection-services/values.yaml | 9 +- .../business-services/egov-hrms/values.yaml | 15 + deploy-as-code/helm/charts/common/values.yaml | 12 +- .../core-services/audit-service/Chart.yaml | 26 + .../audit-service/templates/deployment.yaml | 2 + .../audit-service/templates/ingress.yaml | 2 + .../audit-service/templates/service.yaml | 2 + .../core-services/audit-service/values.yaml | 61 ++ .../core-services/boundary-service/Chart.yaml | 26 + .../templates/deployment.yaml | 2 + .../boundary-service/templates/ingress.yaml | 2 + .../boundary-service/templates/service.yaml | 2 + .../boundary-service/values.yaml | 108 ++ .../core-services/egov-idgen/values.yaml | 7 + .../core-services/egov-pg-service/values.yaml | 2 + .../egov-url-shortening-mgs/Chart.yaml | 26 + .../templates/deployment.yaml | 2 + .../templates/ingress.yaml | 2 + .../templates/service.yaml | 2 + .../egov-url-shortening-mgs/values.yaml | 80 ++ .../egov-url-shortening/values.yaml | 1 + .../echallan-calculator/values.yaml | 2 + .../echallan-services/values.yaml | 2 + .../egov-penalty-schedular/Chart.yaml | 26 + .../templates/cronjob.yaml | 2 + .../egov-penalty-schedular/values.yaml | 54 + .../property-services/values.yaml | 5 +- .../ws-calculator/values.yaml | 14 + .../ws-services/values.yaml | 11 + .../utilities/boundary-bulk-bff/Chart.yaml | 26 + .../templates/deployment.yaml | 2 + .../boundary-bulk-bff/templates/ingress.yaml | 2 + .../boundary-bulk-bff/templates/service.yaml | 2 + .../utilities/boundary-bulk-bff/values.yaml | 133 +++ .../naljal-custom-service/Chart.yaml | 26 + .../templates/deployment.yaml | 2 + .../templates/ingress.yaml | 2 + .../templates/service.yaml | 2 + .../naljal-custom-service/values.yaml | 96 ++ .../values.yaml | 2 + .../rollout-dashboard-cronjob/values.yaml | 2 + .../helm/environments/assam-prod.yaml | 20 +- deploy-as-code/helm/environments/uat.yaml | 969 ++++++++++++++++++ 43 files changed, 1783 insertions(+), 10 deletions(-) create mode 100644 deploy-as-code/helm/charts/core-services/audit-service/Chart.yaml create mode 100644 deploy-as-code/helm/charts/core-services/audit-service/templates/deployment.yaml create mode 100644 deploy-as-code/helm/charts/core-services/audit-service/templates/ingress.yaml create mode 100644 deploy-as-code/helm/charts/core-services/audit-service/templates/service.yaml create mode 100644 deploy-as-code/helm/charts/core-services/audit-service/values.yaml create mode 100644 deploy-as-code/helm/charts/core-services/boundary-service/Chart.yaml create mode 100644 deploy-as-code/helm/charts/core-services/boundary-service/templates/deployment.yaml create mode 100644 deploy-as-code/helm/charts/core-services/boundary-service/templates/ingress.yaml create mode 100644 deploy-as-code/helm/charts/core-services/boundary-service/templates/service.yaml create mode 100644 deploy-as-code/helm/charts/core-services/boundary-service/values.yaml create mode 100644 deploy-as-code/helm/charts/core-services/egov-url-shortening-mgs/Chart.yaml create mode 100644 deploy-as-code/helm/charts/core-services/egov-url-shortening-mgs/templates/deployment.yaml create mode 100644 deploy-as-code/helm/charts/core-services/egov-url-shortening-mgs/templates/ingress.yaml create mode 100644 deploy-as-code/helm/charts/core-services/egov-url-shortening-mgs/templates/service.yaml create mode 100644 deploy-as-code/helm/charts/core-services/egov-url-shortening-mgs/values.yaml create mode 100644 deploy-as-code/helm/charts/municipal-services/egov-penalty-schedular/Chart.yaml create mode 100644 deploy-as-code/helm/charts/municipal-services/egov-penalty-schedular/templates/cronjob.yaml create mode 100644 deploy-as-code/helm/charts/municipal-services/egov-penalty-schedular/values.yaml create mode 100644 deploy-as-code/helm/charts/utilities/boundary-bulk-bff/Chart.yaml create mode 100644 deploy-as-code/helm/charts/utilities/boundary-bulk-bff/templates/deployment.yaml create mode 100644 deploy-as-code/helm/charts/utilities/boundary-bulk-bff/templates/ingress.yaml create mode 100644 deploy-as-code/helm/charts/utilities/boundary-bulk-bff/templates/service.yaml create mode 100644 deploy-as-code/helm/charts/utilities/boundary-bulk-bff/values.yaml create mode 100644 deploy-as-code/helm/charts/utilities/naljal-custom-service/Chart.yaml create mode 100644 deploy-as-code/helm/charts/utilities/naljal-custom-service/templates/deployment.yaml create mode 100644 deploy-as-code/helm/charts/utilities/naljal-custom-service/templates/ingress.yaml create mode 100644 deploy-as-code/helm/charts/utilities/naljal-custom-service/templates/service.yaml create mode 100644 deploy-as-code/helm/charts/utilities/naljal-custom-service/values.yaml create mode 100644 deploy-as-code/helm/environments/uat.yaml diff --git a/deploy-as-code/helm/charts/business-services/collection-services/values.yaml b/deploy-as-code/helm/charts/business-services/collection-services/values.yaml index f6f96939e..cdc441852 100644 --- a/deploy-as-code/helm/charts/business-services/collection-services/values.yaml +++ b/deploy-as-code/helm/charts/business-services/collection-services/values.yaml @@ -133,7 +133,14 @@ env: | - name: SECURITY_BASIC_ENABLED value: "false" - name: MANAGEMENT_SECURITY_ENABLED - value: "false" + value: "false" + - name: EGOV_MDMS_HOST + valueFrom: + configMapKeyRef: + name: egov-service-host + key: egov-mdms-service + - name: EGOV_MDMS_SEARCH_ENDPOINT + value: {{ index .Values "egov-mdms-search-endpoint" | quote }} - name: EGOV_LOCALIZATION_HOST valueFrom: configMapKeyRef: diff --git a/deploy-as-code/helm/charts/business-services/egov-hrms/values.yaml b/deploy-as-code/helm/charts/business-services/egov-hrms/values.yaml index f9567086d..0eeeb1c9f 100644 --- a/deploy-as-code/helm/charts/business-services/egov-hrms/values.yaml +++ b/deploy-as-code/helm/charts/business-services/egov-hrms/values.yaml @@ -134,3 +134,18 @@ env: | - name: TRACER_OPENTRACING_ENABLED value: "true" {{- end }} + - name: ELASTICSEARCH_HOST + valueFrom: + configMapKeyRef: + name: egov-config + key: es-indexer-host + - name: EGOV_ES_USERNAME + valueFrom: + secretKeyRef: + key: username + name: elasticsearch-master-credentials + - name: EGOV_ES_PASSWORD + valueFrom: + secretKeyRef: + key: password + name: elasticsearch-master-credentials diff --git a/deploy-as-code/helm/charts/common/values.yaml b/deploy-as-code/helm/charts/common/values.yaml index fb0c6cf36..626a3020f 100755 --- a/deploy-as-code/helm/charts/common/values.yaml +++ b/deploy-as-code/helm/charts/common/values.yaml @@ -134,9 +134,17 @@ extraEnv: name: egov-config key: db-url - name: FLYWAY_ENABLED - value: "false" + {{- if index .Values "flyway-enabled" }} + value: {{ index .Values "flyway-enabled" | quote }} + {{- else }} + value: "false" + {{- end }} - name: SPRING_FLYWAY_ENABLED - value: "false" + {{- if index .Values "spring-flyway-enabled" }} + value: {{ index .Values "spring-flyway-enabled" | quote }} + {{- else }} + value: "false" + {{- end }} - name: MANAGEMENT_ENDPOINTS_WEB_BASE_PATH value: "/" - name: APP_TIMEZONE diff --git a/deploy-as-code/helm/charts/core-services/audit-service/Chart.yaml b/deploy-as-code/helm/charts/core-services/audit-service/Chart.yaml new file mode 100644 index 000000000..c85814354 --- /dev/null +++ b/deploy-as-code/helm/charts/core-services/audit-service/Chart.yaml @@ -0,0 +1,26 @@ +apiVersion: v1 +name: audit-service +description: A Helm chart for Kubernetes + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: application + +# This is the chart version. This version number should be incremented each time you make changes +# to the chart and its templates, including the app version. +version: 0.1.0 + +# This is the version number of the application being deployed. This version number should be +# incremented each time you make changes to the application. +appVersion: 1.16.0 + +dependencies: +- name: common + version: 0.0.5 + repository: file://../../common diff --git a/deploy-as-code/helm/charts/core-services/audit-service/templates/deployment.yaml b/deploy-as-code/helm/charts/core-services/audit-service/templates/deployment.yaml new file mode 100644 index 000000000..3455c0005 --- /dev/null +++ b/deploy-as-code/helm/charts/core-services/audit-service/templates/deployment.yaml @@ -0,0 +1,2 @@ +# deployment.yaml +{{- template "common.deployment" . -}} \ No newline at end of file diff --git a/deploy-as-code/helm/charts/core-services/audit-service/templates/ingress.yaml b/deploy-as-code/helm/charts/core-services/audit-service/templates/ingress.yaml new file mode 100644 index 000000000..9a573c0d7 --- /dev/null +++ b/deploy-as-code/helm/charts/core-services/audit-service/templates/ingress.yaml @@ -0,0 +1,2 @@ +# ingress.yaml +{{- template "common.ingress" . -}} \ No newline at end of file diff --git a/deploy-as-code/helm/charts/core-services/audit-service/templates/service.yaml b/deploy-as-code/helm/charts/core-services/audit-service/templates/service.yaml new file mode 100644 index 000000000..735644576 --- /dev/null +++ b/deploy-as-code/helm/charts/core-services/audit-service/templates/service.yaml @@ -0,0 +1,2 @@ +# service.yaml +{{- template "common.service" . -}} \ No newline at end of file diff --git a/deploy-as-code/helm/charts/core-services/audit-service/values.yaml b/deploy-as-code/helm/charts/core-services/audit-service/values.yaml new file mode 100644 index 000000000..f1b54f6c0 --- /dev/null +++ b/deploy-as-code/helm/charts/core-services/audit-service/values.yaml @@ -0,0 +1,61 @@ +# Common Labels +labels: + app: "audit-service" + group: "core" + +# Ingress Configs +ingress: + enabled: true + zuul: true + context: "audit-service" + +# Init Containers Configs +initContainers: + dbMigration: + enabled: true + schemaTable: "audit_service_schema" + image: + repository: "audit-service-db" + +# Container Configs +image: + repository: "audit-service" +replicas: "1" +healthChecks: + enabled: true + livenessProbePath: "/audit-service/health" + readinessProbePath: "/audit-service/health" +appType: "java-spring" +tracing-enabled: true +heap: "-Xmx64m -Xms64m" +java-args: "-Dspring.profiles.active=monitoring" + +# Additional Container Envs +env: | + - name: SPRING_KAFKA_CONSUMER_GROUP_ID + value: audit-service + - name: SPRING_KAFKA_PRODUCER_KEY_SERIALIZER + value: org.apache.kafka.common.serialization.StringSerializer + - name: SPRING_KAFKA_PRODUCER_VALUE_SERIALIZER + value: org.springframework.kafka.support.serializer.JsonSerializer + - name: PROCESS_AUDIT_LOGS_KAFKA_TOPIC + value: process-audit-records + - name: PERSIST_AUDIT_LOGS_KAFKA_TOPIC + value: persist-audit-records + - name: JAVA_OPTS + value: {{ index .Values "heap" | quote }} + - name: SERVER_PORT + value: "8080" + - name: JAVA_ARGS + value: {{ index .Values "java-args" | quote }} + - name: SECURITY_BASIC_ENABLED + value: "false" + - name: MANAGEMENT_SECURITY_ENABLED + value: "false" + - name: EGOV_PERSIST_YML_REPO_PATH + value: "https://raw.githubusercontent.com/misdwss/config-mgramseva/UAT/egov-persister/mdms-persister.yml" + - name: EGOV_ENC_SIGN_HOST + valueFrom: + configMapKeyRef: + name: egov-service-host + key: egov-enc-service diff --git a/deploy-as-code/helm/charts/core-services/boundary-service/Chart.yaml b/deploy-as-code/helm/charts/core-services/boundary-service/Chart.yaml new file mode 100644 index 000000000..f832e881d --- /dev/null +++ b/deploy-as-code/helm/charts/core-services/boundary-service/Chart.yaml @@ -0,0 +1,26 @@ +apiVersion: v2 +name: boundary-service +description: A Helm chart for Kubernetes + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: application + +# This is the chart version. This version number should be incremented each time you make changes +# to the chart and its templates, including the app version. +version: 0.1.0 + +# This is the version number of the application being deployed. This version number should be +# incremented each time you make changes to the application. +appVersion: 1.16.0 + +dependencies: +- name: common + version: 0.0.5 + repository: file://../../common diff --git a/deploy-as-code/helm/charts/core-services/boundary-service/templates/deployment.yaml b/deploy-as-code/helm/charts/core-services/boundary-service/templates/deployment.yaml new file mode 100644 index 000000000..3455c0005 --- /dev/null +++ b/deploy-as-code/helm/charts/core-services/boundary-service/templates/deployment.yaml @@ -0,0 +1,2 @@ +# deployment.yaml +{{- template "common.deployment" . -}} \ No newline at end of file diff --git a/deploy-as-code/helm/charts/core-services/boundary-service/templates/ingress.yaml b/deploy-as-code/helm/charts/core-services/boundary-service/templates/ingress.yaml new file mode 100644 index 000000000..9a573c0d7 --- /dev/null +++ b/deploy-as-code/helm/charts/core-services/boundary-service/templates/ingress.yaml @@ -0,0 +1,2 @@ +# ingress.yaml +{{- template "common.ingress" . -}} \ No newline at end of file diff --git a/deploy-as-code/helm/charts/core-services/boundary-service/templates/service.yaml b/deploy-as-code/helm/charts/core-services/boundary-service/templates/service.yaml new file mode 100644 index 000000000..735644576 --- /dev/null +++ b/deploy-as-code/helm/charts/core-services/boundary-service/templates/service.yaml @@ -0,0 +1,2 @@ +# service.yaml +{{- template "common.service" . -}} \ No newline at end of file diff --git a/deploy-as-code/helm/charts/core-services/boundary-service/values.yaml b/deploy-as-code/helm/charts/core-services/boundary-service/values.yaml new file mode 100644 index 000000000..ae8f2adb0 --- /dev/null +++ b/deploy-as-code/helm/charts/core-services/boundary-service/values.yaml @@ -0,0 +1,108 @@ +# Common Labels +labels: + app: "boundary-service" + group: "core" + +# Ingress Configs +ingress: + enabled: true + zuul: true + context: "boundary-service" + +initContainers: + dbMigration: + enabled: true + schemaTable: "boundary_service_schema" + image: + repository: "boundary-service-db" + +# Container Configs +image: + repository: "boundary-service" +replicas: "1" +healthChecks: + enabled: true + livenessProbePath: "/boundary-service/health" + readinessProbePath: "/boundary-service/health" +appType: "java-spring" +tracing-enabled: true +heap: "-Xmx256m -Xms256m" +memory_limits: 512Mi +java-args: "-Dspring.profiles.active=monitoring" +kafka-topics-create-boundary: "create-boundary-entity" +kafka-topics-update-boundary: "update-boundary-entity" +kafka-topics-create-boundary-hierarchy: "save-boundary-hierarchy-definition" +kafka-topics-update-boundary-hierarchy: "update-boundary-hierarchy-definition" +kafka-topics-create-boundary-relationship: "save-boundary-relationship" +kafka-topics-update-boundary-relationship: "update-boundary-relationship" + +# Additional Container Envs +env: | + - name: SERVER_CONTEXT_PATH + value: /boundary-service + - name: SPRING_KAFKA_CONSUMER_GROUP_ID + value: boundary-service + - name: SPRING_KAFKA_PRODUCER_KEY_SERIALIZER + value: org.apache.kafka.common.serialization.StringSerializer + {{- if index .Values "global" "serializers-timezone-in-ist" }} + - name: SPRING_KAFKA_PRODUCER_VALUE_SERIALIZER + value: org.egov.tracer.kafka.serializer.ISTTimeZoneJsonSerializer + {{- end }} + - name: JAVA_OPTS + value: {{ index .Values "heap" | quote }} + - name: JAVA_ARGS + value: {{ index .Values "java-args" | quote }} + - name: SERVER_PORT + value: "8080" + - name: SECURITY_BASIC_ENABLED + value: "false" + - name: MANAGEMENT_SECURITY_ENABLED + value: "false" + - name: JAVA_ENABLE_DEBUG + value: "true" + - name: KAFKA_TOPICS_CREATE_BOUNDARY + value: {{ index .Values "kafka-topics-create-boundary" | quote }} + - name: KAFKA_TOPICS_CREATE_BOUNDARY_HIERARCHY + value: {{ index .Values "kafka-topics-create-boundary-hierarchy" | quote }} + - name: KAFKA_TOPICS_CREATE_BOUNDARY_RELATIONSHIP + value: {{ index .Values "kafka-topics-create-boundary-relationship" | quote }} + - name: KAFKA_TOPICS_UPDATE_BOUNDARY_RELATIONSHIP + value: {{ index .Values "kafka-topics-update-boundary-relationship" | quote }} + - name: KAFKA_TOPICS_UPDATE_BOUNDARY + value: {{ index .Values "kafka-topics-update-boundary" | quote }} + - name: KAFKA_TOPICS_UPDATE_BOUNDARY_HIERARCHY + value: {{ index .Values "kafka-topics-update-boundary-hierarchy" | quote }} + - name: EGOV_MDMS_HOST + valueFrom: + configMapKeyRef: + name: egov-service-host + key: egov-mdms-service + - name: EGOV_MDMS_SEARCH_ENDPOINT + value: {{ index .Values "egov-mdms-search-endpoint" | quote }} + - name: EGOV_MDMS_CREATE_ENDPOINT + value: {{ index .Values "egov-mdms-create-endpoint" | quote }} + - name: EGOV_LOCALIZATION_HOST + valueFrom: + configMapKeyRef: + name: egov-service-host + key: egov-localization + - name: EGOV_HRMS_HOST + valueFrom: + configMapKeyRef: + name: egov-service-host + key: egov-hrms + - name: EGOV_USER_HOST + valueFrom: + configMapKeyRef: + name: egov-service-host + key: egov-user + - name: EGOV_IDGEN_HOST + valueFrom: + configMapKeyRef: + name: egov-service-host + key: egov-idgen + - name: EGOV_URL_SHORTNER_HOST + valueFrom: + configMapKeyRef: + name: egov-service-host + key: egov-url-shortening \ No newline at end of file diff --git a/deploy-as-code/helm/charts/core-services/egov-idgen/values.yaml b/deploy-as-code/helm/charts/core-services/egov-idgen/values.yaml index b14132736..0adfa18c1 100644 --- a/deploy-as-code/helm/charts/core-services/egov-idgen/values.yaml +++ b/deploy-as-code/helm/charts/core-services/egov-idgen/values.yaml @@ -44,6 +44,13 @@ env: | value: {{ index .Values "idformat-from-mdms" | quote }} - name: AUTOCREATE_NEW_SEQ value: {{ index .Values "autocreate-new-seq" | quote }} + - name: MDMS_SERVICE_SEARCH_URI + value: {{ index .Values "mdms-service-search-uri" | quote }} + - name: MDMS_SERVICE_HOST + valueFrom: + configMapKeyRef: + name: egov-service-host + key: egov-mdms-service - name: SECURITY_BASIC_ENABLED value: "false" - name: MANAGEMENT_SECURITY_ENABLED diff --git a/deploy-as-code/helm/charts/core-services/egov-pg-service/values.yaml b/deploy-as-code/helm/charts/core-services/egov-pg-service/values.yaml index 20409e0ae..73ab41255 100644 --- a/deploy-as-code/helm/charts/core-services/egov-pg-service/values.yaml +++ b/deploy-as-code/helm/charts/core-services/egov-pg-service/values.yaml @@ -155,6 +155,8 @@ env: | value: {{ index .Values "payu-url" | quote }} - name: PAYU_URL_STATUS value: {{ index .Values "payu-url-status" | quote }} + - name: EGOV_URL_SHORTNER_ENDPOINT + value: {{ index .Values "egov-url-shortener-endpoint" | quote }} - name: PAYU_MERCHANT_KEY valueFrom: secretKeyRef: diff --git a/deploy-as-code/helm/charts/core-services/egov-url-shortening-mgs/Chart.yaml b/deploy-as-code/helm/charts/core-services/egov-url-shortening-mgs/Chart.yaml new file mode 100644 index 000000000..fe6c838a2 --- /dev/null +++ b/deploy-as-code/helm/charts/core-services/egov-url-shortening-mgs/Chart.yaml @@ -0,0 +1,26 @@ +apiVersion: v2 +name: egov-url-shortening-mgs +description: A Helm chart for Kubernetes + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: application + +# This is the chart version. This version number should be incremented each time you make changes +# to the chart and its templates, including the app version. +version: 0.1.0 + +# This is the version number of the application being deployed. This version number should be +# incremented each time you make changes to the application. +appVersion: 1.16.0 + +dependencies: +- name: common + version: 0.0.5 + repository: file://../../common diff --git a/deploy-as-code/helm/charts/core-services/egov-url-shortening-mgs/templates/deployment.yaml b/deploy-as-code/helm/charts/core-services/egov-url-shortening-mgs/templates/deployment.yaml new file mode 100644 index 000000000..3455c0005 --- /dev/null +++ b/deploy-as-code/helm/charts/core-services/egov-url-shortening-mgs/templates/deployment.yaml @@ -0,0 +1,2 @@ +# deployment.yaml +{{- template "common.deployment" . -}} \ No newline at end of file diff --git a/deploy-as-code/helm/charts/core-services/egov-url-shortening-mgs/templates/ingress.yaml b/deploy-as-code/helm/charts/core-services/egov-url-shortening-mgs/templates/ingress.yaml new file mode 100644 index 000000000..9a573c0d7 --- /dev/null +++ b/deploy-as-code/helm/charts/core-services/egov-url-shortening-mgs/templates/ingress.yaml @@ -0,0 +1,2 @@ +# ingress.yaml +{{- template "common.ingress" . -}} \ No newline at end of file diff --git a/deploy-as-code/helm/charts/core-services/egov-url-shortening-mgs/templates/service.yaml b/deploy-as-code/helm/charts/core-services/egov-url-shortening-mgs/templates/service.yaml new file mode 100644 index 000000000..735644576 --- /dev/null +++ b/deploy-as-code/helm/charts/core-services/egov-url-shortening-mgs/templates/service.yaml @@ -0,0 +1,2 @@ +# service.yaml +{{- template "common.service" . -}} \ No newline at end of file diff --git a/deploy-as-code/helm/charts/core-services/egov-url-shortening-mgs/values.yaml b/deploy-as-code/helm/charts/core-services/egov-url-shortening-mgs/values.yaml new file mode 100644 index 000000000..29e491b95 --- /dev/null +++ b/deploy-as-code/helm/charts/core-services/egov-url-shortening-mgs/values.yaml @@ -0,0 +1,80 @@ +# Common Labels +labels: + app: "egov-url-shortening-mgs" + group: "egov" + +# Ingress Configs +ingress: + enabled: true + zuul: false + context: "eus1" + +# Init Containers Configs +initContainers: + dbMigration: + enabled: true + schemaTable: "egov-url-shortening_schema" + image: + repository: "egov-url-shortening-mgs-db" + +# Container Configs +image: + repository: "egov-url-shortening-mgs" +replicas: "1" +healthChecks: + enabled: true + livenessProbePath: "/eus1/health" + readinessProbePath: "/eus1/health" +appType: "java-spring" +tracing-enabled: true +heap: "-Xmx192m -Xms192m" +java-args: "-Dspring.profiles.active=monitoring" +server-context: "/eus1" + +# Additional Container Envs +env: | + {{- if index .Values "global" "tracer-errors-provideexceptionindetails" }} + - name: TRACER_ERRORS_PROVIDEEXCEPTIONINDETAILS + valueFrom: + configMapKeyRef: + name: egov-config + key: tracer-errors-provideexceptionindetails + {{- end }} + - name: JAVA_ENABLE_DEBUG + value: "true" + - name: SPRING_REDIS_HOST + {{- if index .Values "cluster-configs" "configmaps" "egov-service-host" "data" "redis-host" }} + valueFrom: + configMapKeyRef: + name: egov-service-host + key: redis-host + {{- else }} + value: "redis.backbone" + {{- end }} + - name: SPRING_REDIS_PORT + value: "6379" + - name: SERVER_CONTEXT_PATH + value: {{ index .Values "server-context" | quote }} + - name: SERVER_SERVLET_CONTEXT_PATH + value: {{ index .Values "server-context" | quote }} + - name: SERVER_CONTEXTPATH + value: {{ index .Values "server-context" | quote }} + - name: JAVA_OPTS + value: {{ index .Values "heap" | quote }} + - name: JAVA_ARGS + value: {{ index .Values "java-args" | quote }} + - name: SERVER_PORT + value: "8080" + - name: SECURITY_BASIC_ENABLED + value: "false" + - name: MANAGEMENT_SECURITY_ENABLED + value: "false" + {{- if index .Values "tracing-enabled" }} + - name: TRACER_OPENTRACING_ENABLED + value: "true" + {{- end }} + - name: HOST_NAME + valueFrom: + configMapKeyRef: + name: egov-config + key: egov-services-fqdn-name diff --git a/deploy-as-code/helm/charts/core-services/egov-url-shortening/values.yaml b/deploy-as-code/helm/charts/core-services/egov-url-shortening/values.yaml index a489d0c77..04b773946 100644 --- a/deploy-as-code/helm/charts/core-services/egov-url-shortening/values.yaml +++ b/deploy-as-code/helm/charts/core-services/egov-url-shortening/values.yaml @@ -30,6 +30,7 @@ tracing-enabled: true heap: "-Xmx384m -Xms256m" memory_limits: 512Mi java-args: "-Dspring.profiles.active=monitoring" +server-context: "/eus" # Additional Container Envs env: | diff --git a/deploy-as-code/helm/charts/municipal-services/echallan-calculator/values.yaml b/deploy-as-code/helm/charts/municipal-services/echallan-calculator/values.yaml index ea3478dc2..6bc34fd4f 100644 --- a/deploy-as-code/helm/charts/municipal-services/echallan-calculator/values.yaml +++ b/deploy-as-code/helm/charts/municipal-services/echallan-calculator/values.yaml @@ -63,6 +63,8 @@ env: | value: {{ index .Values "heap" | quote }} - name: JAVA_ARGS value: {{ index .Values "java-args" | quote }} + - name: EGOV_URL_SHORTNER_ENDPOINT + value: {{ index .Values "egov-url-shortener-endpoint" | quote }} - name: SERVER_PORT value: "8080" - name: SECURITY_BASIC_ENABLED diff --git a/deploy-as-code/helm/charts/municipal-services/echallan-services/values.yaml b/deploy-as-code/helm/charts/municipal-services/echallan-services/values.yaml index f236d14ed..4e60a6e57 100644 --- a/deploy-as-code/helm/charts/municipal-services/echallan-services/values.yaml +++ b/deploy-as-code/helm/charts/municipal-services/echallan-services/values.yaml @@ -122,6 +122,8 @@ env: | value: {{ index .Values "sms-expenditure-mark-bill-enabled" | quote }} - name: SMS_MONTHY_SUMMARY_ENABLED value: {{ index .Values "sms-monthy-summary-enabled" | quote }} + - name: EGOV_MDMS_SEARCH_ENDPOINT + value: {{ index .Values "egov-mdms-search-endpoint" | quote }} - name: EGOV_COLLECTION_SERVICE_CREATE_ENDPOINT value: "/collection-services/payments/_create" - name: EGOV_COLLECTION_SERVICE_SEARCH diff --git a/deploy-as-code/helm/charts/municipal-services/egov-penalty-schedular/Chart.yaml b/deploy-as-code/helm/charts/municipal-services/egov-penalty-schedular/Chart.yaml new file mode 100644 index 000000000..f1b7358a8 --- /dev/null +++ b/deploy-as-code/helm/charts/municipal-services/egov-penalty-schedular/Chart.yaml @@ -0,0 +1,26 @@ +apiVersion: v2 +name: egov-penalty-schedular +description: A Helm chart for Kubernetes + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: application + +# This is the chart version. This version number should be incremented each time you make changes +# to the chart and its templates, including the app version. +version: 0.1.0 + +# This is the version number of the application being deployed. This version number should be +# incremented each time you make changes to the application. +appVersion: 1.16.0 + +dependencies: +- name: common + version: 0.0.5 + repository: file://../../common \ No newline at end of file diff --git a/deploy-as-code/helm/charts/municipal-services/egov-penalty-schedular/templates/cronjob.yaml b/deploy-as-code/helm/charts/municipal-services/egov-penalty-schedular/templates/cronjob.yaml new file mode 100644 index 000000000..74d9de7ea --- /dev/null +++ b/deploy-as-code/helm/charts/municipal-services/egov-penalty-schedular/templates/cronjob.yaml @@ -0,0 +1,2 @@ +# cronjob.yaml +{{- template "common.cronjob" . -}} \ No newline at end of file diff --git a/deploy-as-code/helm/charts/municipal-services/egov-penalty-schedular/values.yaml b/deploy-as-code/helm/charts/municipal-services/egov-penalty-schedular/values.yaml new file mode 100644 index 000000000..c424af823 --- /dev/null +++ b/deploy-as-code/helm/charts/municipal-services/egov-penalty-schedular/values.yaml @@ -0,0 +1,54 @@ +# Common Labels +labels: + app: "egov-penalty-schedular" + group: "mgramseva" + +cron: + schedule: "*/30 * * * *" + + +# Container Configs +image: + repository: "egov-penalty-schedular" + +cron_appType: "java-spring" + + +# Additional Container Envs +env: | + - name: MDMS_EVENT_TENANTID + value: {{ index .Values "mdms-event-tenantId" | quote }} + - name: EGOV_MDMS_HOST + valueFrom: + configMapKeyRef: + name: egov-service-host + key: egov-mdms-service + - name: EGOV_WSCALCULATOR_HOST + valueFrom: + configMapKeyRef: + name: egov-service-host + key: ws-calculator + - name: USER_SYSTEM_UUID + valueFrom: + secretKeyRef: + name: egov-penalty-schedular + key: uuid + - name: USER_SYSTEM_MOBILENUMBER + valueFrom: + secretKeyRef: + name: egov-penalty-schedular + key: mobileNumber + - name: USER_SYSTEM_ROLE + value: {{ index .Values "user-system-role" | quote }} + - name: EGOV_MDMS_SEARCH_ENDPOINT + value: {{ index .Values "egov-mdms-search-endpoint" | quote }} + - name: EGOV_WSCALCULATOR_URL + value: {{ index .Values "egov-wscalculator-url" | quote }} + - name: EGOV_PENALTY_ENABLED + value: {{ index .Values "egov-penalty-enabled" | quote }} + - name: EGOV_PENALTY_ENABLED_DIVISION_CODE_LIST + value: {{ index .Values "egov-penalty-enabled-division-code-list" | quote }} + {{- if index .Values "java-enable-debug" }} + - name: JAVA_ENABLE_DEBUG + value: "true" + {{- end }} diff --git a/deploy-as-code/helm/charts/municipal-services/property-services/values.yaml b/deploy-as-code/helm/charts/municipal-services/property-services/values.yaml index d81d5167a..8895cfee6 100644 --- a/deploy-as-code/helm/charts/municipal-services/property-services/values.yaml +++ b/deploy-as-code/helm/charts/municipal-services/property-services/values.yaml @@ -133,8 +133,9 @@ env: | - name: EGOV_IDGEN_ASSM_FORMAT value: {{ index .Values "egov-idgen-assm-format" | quote }} - name: EGOV_IDGEN_PTID_FORMAT - value: {{ index .Values "egov-idgen-ptid-format" | quote }} - + value: {{ index .Values "egov-idgen-ptid-format" | quote }} + - name: EGOV_URL_SHORTNER_ENDPOINT + value: {{ index .Values "egov-url-shortener-endpoint" | quote }} - name: NOTIFICATION_SMS_ENABLED value: {{ index .Values "notification-sms-enabled" | quote }} - name: EGOV_USER_EVENT_NOTIFICATION_ENABLED diff --git a/deploy-as-code/helm/charts/municipal-services/ws-calculator/values.yaml b/deploy-as-code/helm/charts/municipal-services/ws-calculator/values.yaml index 6bb5c7dd7..9248c252a 100644 --- a/deploy-as-code/helm/charts/municipal-services/ws-calculator/values.yaml +++ b/deploy-as-code/helm/charts/municipal-services/ws-calculator/values.yaml @@ -90,6 +90,10 @@ env: | configMapKeyRef: name: egov-service-host key: egov-url-shortening + - name: EGOV_SHORTENER_URL + value: {{ index .Values "egov-shortener-url" | quote }} + - name: EGOV_URL_SHORTNER_ENDPOINT + value: {{ index .Values "egov-url-shortener-endpoint" | quote }} - name: WORKFLOW_WORKDIR_PATH valueFrom: configMapKeyRef: @@ -112,6 +116,16 @@ env: | value: {{ index .Values "sms-payment-link-enabled" | quote }} - name: SMS_BILL_DOWNLOAD_ENABLED value: {{ index .Values "sms-bill-download-enable" | quote }} + - name: PENALTY_START_THRESHOLD_TIME + value: {{ index .Values "penalty-start-threshold-time" | quote }} + - name: PENALTY_APPLICABLE_IN_DAYS + value: {{ index .Values "penalty-applicable-in-days" | quote }} + - name: IS_PENALTY_FEATURE_ENABLE + value: {{ index .Values "is-penalty-feature-enable" | quote }} + - name: IS_SAVE_DEMAND_AUDIT_ENABLED + value: {{ index .Values "is-save-demand-audit-enabled" | quote }} + - name: EGOV_SAVE_DEMAND_AUDIT_FROM_WSCAL + value: {{ index .Values "egov-save-demand-audit-from-wscal" | quote }} - name: SPRING_KAFKA_PRODUCER_KEY_SERIALIZER value: org.apache.kafka.common.serialization.StringSerializer - name: SPRING_KAFKA_PRODUCER_VALUE_SERIALIZER diff --git a/deploy-as-code/helm/charts/municipal-services/ws-services/values.yaml b/deploy-as-code/helm/charts/municipal-services/ws-services/values.yaml index a26b927fc..f477fcf5d 100644 --- a/deploy-as-code/helm/charts/municipal-services/ws-services/values.yaml +++ b/deploy-as-code/helm/charts/municipal-services/ws-services/values.yaml @@ -58,6 +58,11 @@ env: | configMapKeyRef: name: egov-service-host key: property-services + - name: EGOV_COLLECTION_HOST + valueFrom: + configMapKeyRef: + name: egov-service-host + key: collection-services - name: EGOV_MDMS_HOST valueFrom: configMapKeyRef: @@ -112,6 +117,12 @@ env: | value: {{ index .Values "sms-workflow-enabled" | quote }} - name: SMS_FEEDBACK_NOTIFICATION_ENABLED value: {{ index .Values "sms-feedback-notification-enabled" | quote }} + - name: EGOV_URL_SHORTNER_ENDPOINT + value: {{ index .Values "egov-url-shortener-endpoint" | quote }} + - name: EGOV_SHORTENER_URL + value: {{ index .Values "egov-shortener-url" | quote }} + - name: REPORT_IN_CHRONOLOGICAL_ORDER + value: {{ index .Values "report-in-chronological-order" | quote }} - name: EGOV_FILESTORE_HOST valueFrom: configMapKeyRef: diff --git a/deploy-as-code/helm/charts/utilities/boundary-bulk-bff/Chart.yaml b/deploy-as-code/helm/charts/utilities/boundary-bulk-bff/Chart.yaml new file mode 100644 index 000000000..b304b5048 --- /dev/null +++ b/deploy-as-code/helm/charts/utilities/boundary-bulk-bff/Chart.yaml @@ -0,0 +1,26 @@ +apiVersion: v2 +name: boundary-bulk-bff +description: A Helm chart for Kubernetes + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: application + +# This is the chart version. This version number should be incremented each time you make changes +# to the chart and its templates, including the app version. +version: 0.1.0 + +# This is the version number of the application being deployed. This version number should be +# incremented each time you make changes to the application. +appVersion: 1.16.0 + +dependencies: +- name: common + version: 0.0.5 + repository: file://../../common diff --git a/deploy-as-code/helm/charts/utilities/boundary-bulk-bff/templates/deployment.yaml b/deploy-as-code/helm/charts/utilities/boundary-bulk-bff/templates/deployment.yaml new file mode 100644 index 000000000..3455c0005 --- /dev/null +++ b/deploy-as-code/helm/charts/utilities/boundary-bulk-bff/templates/deployment.yaml @@ -0,0 +1,2 @@ +# deployment.yaml +{{- template "common.deployment" . -}} \ No newline at end of file diff --git a/deploy-as-code/helm/charts/utilities/boundary-bulk-bff/templates/ingress.yaml b/deploy-as-code/helm/charts/utilities/boundary-bulk-bff/templates/ingress.yaml new file mode 100644 index 000000000..9a573c0d7 --- /dev/null +++ b/deploy-as-code/helm/charts/utilities/boundary-bulk-bff/templates/ingress.yaml @@ -0,0 +1,2 @@ +# ingress.yaml +{{- template "common.ingress" . -}} \ No newline at end of file diff --git a/deploy-as-code/helm/charts/utilities/boundary-bulk-bff/templates/service.yaml b/deploy-as-code/helm/charts/utilities/boundary-bulk-bff/templates/service.yaml new file mode 100644 index 000000000..735644576 --- /dev/null +++ b/deploy-as-code/helm/charts/utilities/boundary-bulk-bff/templates/service.yaml @@ -0,0 +1,2 @@ +# service.yaml +{{- template "common.service" . -}} \ No newline at end of file diff --git a/deploy-as-code/helm/charts/utilities/boundary-bulk-bff/values.yaml b/deploy-as-code/helm/charts/utilities/boundary-bulk-bff/values.yaml new file mode 100644 index 000000000..46d3ed912 --- /dev/null +++ b/deploy-as-code/helm/charts/utilities/boundary-bulk-bff/values.yaml @@ -0,0 +1,133 @@ +global: + containerRegistry: egovio +# Common Labels +labels: + app: "boundary-bulk-bff" + group: "rainmaker" + +namespace: egov + +# Ingress Configs +ingress: + namespace: egov + enabled: true + zuul: true + context: "boundary-bulk-bff" + +# Init Containers Configs +initContainers: + dbMigration: + enabled: true + schemaTable: "boundary_bulk_bff_schema" + image: + repository: "boundary-bulk-bff-db" + +# Container Configs +image: + repository: "boundary-bulk-bff" +replicas: "1" + +# Additional Container Envs +env: | + - name: KAFKA_BROKER_HOST + valueFrom: + configMapKeyRef: + name: egov-config + key: kafka-brokers + - name: EGOV_FILESTORE_SERVICE_HOST + valueFrom: + configMapKeyRef: + name: egov-service-host + key: egov-filestore + - name: EGOV_BOUNDARY_HOST + valueFrom: + configMapKeyRef: + name: egov-service-host + key: boundary-service + - name: EGOV_LOCALIZATION_HOST + valueFrom: + configMapKeyRef: + name: egov-service-host + key: egov-localization + - name: FILE_STORE_SERVICE_END_POINT + value: filestore/v1/files + - name: EGOV_BOUNDARY_RELATIONSHIP_SEARCHPATH + value: boundary-service/boundary-relationships/_search + - name: EGOV_BOUNDARY_SERVICE_SEARCHPATH + value: boundary-service/boundary/_search + - name: EGOV_BOUNDARY_HIERARCHY_SEARCHPATH + value: boundary-service/boundary-hierarchy-definition/_search + - name: EGOV_BOUNDARY_ENTITY_SEARCHPATH + value: boundary-service/boundary/_search + - name: EGOV_BOUNDARY_ENTITY_CREATEPATH + value: boundary-service/boundary/_create + - name: "DB_URL" + valueFrom: + configMapKeyRef: + name: egov-config + key: db-url + + - name: "SCHEMA_TABLE" + value: {{ .Values.initContainers.dbMigration.schemaTable | quote }} + - name: "FLYWAY_USER" + valueFrom: + secretKeyRef: + name: db + key: flyway-username + - name: "FLYWAY_PASSWORD" + valueFrom: + secretKeyRef: + name: db + key: flyway-password + - name: "FLYWAY_LOCATIONS" + valueFrom: + configMapKeyRef: + name: egov-config + key: flyway-locations + - name: DB_HOST + valueFrom: + configMapKeyRef: + name: egov-config + key: db-host + - name: DB_NAME + valueFrom: + configMapKeyRef: + name: egov-config + key: db-name + - name: DB_USER + valueFrom: + secretKeyRef: + name: db + key: username + - name: DB_PASSWORD + valueFrom: + secretKeyRef: + name: db + key: password + - name: DB_PORT + value: "5432" + - name: DB_SCHEMA + value: "assam" + - name: LOCALE + value: {{ .Values.defaultLocale | default "en_IN" }} + - name: LOCALIZATION_MODULE + value: "rainmaker-admin-schemas" + - name: APP_LOG_LEVEL + value: {{ .Values.logLevel | default "info" }} + - name: APP_MAX_DEBUG_CHAR + value: "{{ .Values.maxDebugChar | default "500" }}" + + - name: CACHE_ENABLED + value: "true" + - name: RESET_CACHE + value: "true" + - name: REDIS_PORT + value: "6379" + - name: REDIS_HOST + value: "redis.backbone" + - name: EGOV_HOST + value: "https://naljalseva.jjm.gov.in/" + - name: BOUNDARY_CODE_HEADER_NAME + value: "BOUNDARY_CODE" + - name: BOUNDARY_TAB_NAME + value: "BOUNDARY_DATA" diff --git a/deploy-as-code/helm/charts/utilities/naljal-custom-service/Chart.yaml b/deploy-as-code/helm/charts/utilities/naljal-custom-service/Chart.yaml new file mode 100644 index 000000000..c185f9fcb --- /dev/null +++ b/deploy-as-code/helm/charts/utilities/naljal-custom-service/Chart.yaml @@ -0,0 +1,26 @@ +apiVersion: v2 +name: naljal-custom-service +description: A Helm chart for Kubernetes + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: application + +# This is the chart version. This version number should be incremented each time you make changes +# to the chart and its templates, including the app version. +version: 0.1.0 + +# This is the version number of the application being deployed. This version number should be +# incremented each time you make changes to the application. +appVersion: 1.16.0 + +dependencies: +- name: common + version: 0.0.5 + repository: file://../../common diff --git a/deploy-as-code/helm/charts/utilities/naljal-custom-service/templates/deployment.yaml b/deploy-as-code/helm/charts/utilities/naljal-custom-service/templates/deployment.yaml new file mode 100644 index 000000000..3455c0005 --- /dev/null +++ b/deploy-as-code/helm/charts/utilities/naljal-custom-service/templates/deployment.yaml @@ -0,0 +1,2 @@ +# deployment.yaml +{{- template "common.deployment" . -}} \ No newline at end of file diff --git a/deploy-as-code/helm/charts/utilities/naljal-custom-service/templates/ingress.yaml b/deploy-as-code/helm/charts/utilities/naljal-custom-service/templates/ingress.yaml new file mode 100644 index 000000000..9a573c0d7 --- /dev/null +++ b/deploy-as-code/helm/charts/utilities/naljal-custom-service/templates/ingress.yaml @@ -0,0 +1,2 @@ +# ingress.yaml +{{- template "common.ingress" . -}} \ No newline at end of file diff --git a/deploy-as-code/helm/charts/utilities/naljal-custom-service/templates/service.yaml b/deploy-as-code/helm/charts/utilities/naljal-custom-service/templates/service.yaml new file mode 100644 index 000000000..735644576 --- /dev/null +++ b/deploy-as-code/helm/charts/utilities/naljal-custom-service/templates/service.yaml @@ -0,0 +1,2 @@ +# service.yaml +{{- template "common.service" . -}} \ No newline at end of file diff --git a/deploy-as-code/helm/charts/utilities/naljal-custom-service/values.yaml b/deploy-as-code/helm/charts/utilities/naljal-custom-service/values.yaml new file mode 100644 index 000000000..a0ca0ed7b --- /dev/null +++ b/deploy-as-code/helm/charts/utilities/naljal-custom-service/values.yaml @@ -0,0 +1,96 @@ +# Common Labels +labels: + app: "naljal-custom-service" + group: "rainmaker" + +# Ingress Configs +ingress: + enabled: true + zuul: true + context: "naljal-custom-service" + +# Init Containers Configs +initContainers: {} + +# Container Configs +image: + repository: "naljal-custom-service" +replicas: "1" +healthChecks: + enabled: true + livenessProbePath: "/naljal-custom-service/health" + readinessProbePath: "/naljal-custom-service/health" +appType: "java-spring" +tracing-enabled: true +heap: "-Xmx192m -Xms192m" +java-args: "-Dspring.profiles.active=monitoring" + +# Additional Container Envs +env: | + - name: SERVER_CONTEXTPATH + value: /naljal-custom-service + - name: SPRING_KAFKA_CONSUMER_GROUP_ID + value: naljal-custom-service + - name: SPRING_KAFKA_PRODUCER_KEY_SERIALIZER + value: org.apache.kafka.common.serialization.StringSerializer + - name: SPRING_KAFKA_PRODUCER_VALUE_SERIALIZER + value: org.springframework.kafka.support.serializer.JsonSerializer + - name: EGOV_MDMS_HOST + valueFrom: + configMapKeyRef: + name: egov-service-host + key: egov-mdms-service + - name: EGOV_MDMS_SEARCH_ENDPOINT + value: {{ index .Values "egov-mdms-search-endpoint" | quote }} + - name: EGOV_PROPERTY_SERVICE_HOST + valueFrom: + configMapKeyRef: + name: egov-service-host + key: property-services + - name: EGOV_COLLECTION_HOST + valueFrom: + configMapKeyRef: + name: egov-service-host + key: collection-services + - name: EGOV_BILLINGSERVICE_HOST + valueFrom: + configMapKeyRef: + name: egov-service-host + key: billing-service + - name: EGOV_LOCALIZATION_HOST + valueFrom: + configMapKeyRef: + name: egov-service-host + key: egov-localization + - name: EGOV_USER_HOST + valueFrom: + configMapKeyRef: + name: egov-service-host + key: egov-user + - name: EGOV_URL_SHORTNER_HOST + valueFrom: + configMapKeyRef: + name: egov-service-host + key: egov-url-shortening + - name: EGOV_SHORTENER_URL + value: {{ index .Values "egov-shortener-url" | quote }} + - name: EGOV_URL_SHORTNER_ENDPOINT + value: {{ index .Values "egov-url-shortener-endpoint" | quote }} + - name: EGOV_MGRAMSEVA_UI_PATH + value: mgramseva/login + - name: JAVA_OPTS + value: {{ index .Values "heap" | quote }} + - name: JAVA_ARGS + value: {{ index .Values "java-args" | quote }} + - name: EGOV_URL_SHORTNER_ENDPOINT + value: {{ index .Values "egov-url-shortener-endpoint" | quote }} + - name: SERVER_PORT + value: "8080" + - name: SECURITY_BASIC_ENABLED + value: "false" + - name: MANAGEMENT_SECURITY_ENABLED + value: "false" + {{- if index .Values "tracing-enabled" }} + - name: TRACER_OPENTRACING_ENABLED + value: "true" + {{- end }} diff --git a/deploy-as-code/helm/charts/utilities/rollout-dashboard-cronjob-indexer/values.yaml b/deploy-as-code/helm/charts/utilities/rollout-dashboard-cronjob-indexer/values.yaml index 168246071..cf1d6c46d 100644 --- a/deploy-as-code/helm/charts/utilities/rollout-dashboard-cronjob-indexer/values.yaml +++ b/deploy-as-code/helm/charts/utilities/rollout-dashboard-cronjob-indexer/values.yaml @@ -63,5 +63,7 @@ env: | configMapKeyRef: name: egov-config key: egov-state-level-tenant-id + - name: IFIX_DEP_ENTITY_URL + value: "http://ifix-department-entity-service.mgramseva:8080/" resources: | requests: {} diff --git a/deploy-as-code/helm/charts/utilities/rollout-dashboard-cronjob/values.yaml b/deploy-as-code/helm/charts/utilities/rollout-dashboard-cronjob/values.yaml index f1771e8ba..2a5da6fb8 100644 --- a/deploy-as-code/helm/charts/utilities/rollout-dashboard-cronjob/values.yaml +++ b/deploy-as-code/helm/charts/utilities/rollout-dashboard-cronjob/values.yaml @@ -53,5 +53,7 @@ env: | configMapKeyRef: name: egov-config key: egov-state-level-tenant-id + - name: IFIX_DEP_ENTITY_URL + value: "http://ifix-department-entity-service.mgramseva:8080/" resources: | requests: {} diff --git a/deploy-as-code/helm/environments/assam-prod.yaml b/deploy-as-code/helm/environments/assam-prod.yaml index aa39661d7..89388b8eb 100644 --- a/deploy-as-code/helm/environments/assam-prod.yaml +++ b/deploy-as-code/helm/environments/assam-prod.yaml @@ -267,6 +267,10 @@ property-services: egov-shortener-url: "eus/shortener" egov-url-shortener-endpoint: "/eus/shortener" +boundary-service: + egov-mdms-search-endpoint: "/mdms-v2/v1/_search" + egov-mdms-create-endpoint: "/mdms-v2/v2/_create" + mdms-v2: replicas: 2 memory_limits: 512Mi @@ -284,7 +288,7 @@ egov-filestore: aws.s3.url : "https://s3.amazonaws.com" is-s3-enabled: "true" minio-enabled: false - allowed-file-formats-map: "{jpg:{'image/jpg','image/jpeg'},jpeg:{'image/jpeg','image/jpg'},png:{'image/png'},pdf:{'application/pdf'},odt:{'application/vnd.oasis.opendocument.text'},ods:{'application/vnd.oasis.opendocument.spreadsheet'},docx:{'application/x-tika-msoffice','application/x-tika-ooxml','application/vnd.oasis.opendocument.text','application/msword'},doc:{'application/x-tika-msoffice','application/x-tika-ooxml','application/vnd.oasis.opendocument.text','application/msword'},dxf:{'text/plain','application/dxf','application/octet-stream','image/vnd.dxf','image/vnd.dxf; format=ascii','image/vnd.dxf; format=binary','image/vnd.dxb'},csv:{'text/plain'},txt:{'text/plain'},xlsx:{'application/x-tika-ooxml','application/x-tika-msoffice','application/vnd.ms-excel'},xls:{'application/x-tika-ooxml','application/x-tika-msoffice','application/vnd.ms-excel'}}" + allowed-file-formats-map: "{jpg:{'image/jpg','image/jpeg'},jpeg:{'image/jpeg','image/jpg'},png:{'image/png'},pdf:{'application/pdf'},odt:{'application/vnd.oasis.opendocument.text'},ods:{'application/vnd.oasis.opendocument.spreadsheet'},docx:{'application/x-tika-msoffice','application/x-tika-ooxml','application/vnd.oasis.opendocument.text','application/msword'},doc:{'application/x-tika-msoffice','application/x-tika-ooxml','application/vnd.oasis.opendocument.text','application/msword'},dxf:{'text/plain','application/dxf','application/octet-stream','image/vnd.dxf','image/vnd.dxf; format=ascii','image/vnd.dxf; format=binary','image/vnd.dxb'},csv:{'text/plain'},txt:{'text/plain'},xlsx:{'application/x-tika-ooxml','application/x-tika-msoffice','application/vnd.ms-excel','application/vnd.openxmlformats-officedocument.spreadsheetml.sheet','application/zip','multipart/form-data'},xls:{'application/x-tika-ooxml','application/x-tika-msoffice','application/vnd.ms-excel','multipart/form-data'}}" allowed-file-formats: "jpg,jpeg,png,doc,docx,pdf,odt,ods,text,dxf,xls,xlsx" filestore-url-validity: 3600 fixed-bucketname: assam-s3 @@ -372,6 +376,7 @@ ws-services: egov-mdms-search-endpoint: "/mdms-v2/v1/_search" egov-shortener-url: "eus/shortener" egov-url-shortener-endpoint: "/eus/shortener" + report-in-chronological-order: true egov-location: memory_limits: 512Mi @@ -410,6 +415,11 @@ ws-calculator: egov-mdms-search-endpoint: "/mdms-v2/v1/_search" egov-shortener-url: "eus/shortener" egov-url-shortener-endpoint: "/eus/shortener" + penalty-applicable-in-days: 10 + penalty-start-threshold-time: "1680285630000" + is-penalty-feature-enable: true + is-save-demand-audit-enabled: true + egov-save-demand-audit-from-wscal: "save-ws-demand-change-audit" egov-pg-service: replicas: 2 @@ -443,7 +453,7 @@ egov-indexer: gitSync: repo: "git@github.com:ddws-org/config-naljal" branch: "assam" - egov-indexer-yaml-repo-path: "file:///work-dir/config-naljal/egov-indexer/billingservices-indexer.yml,file:///work-dir/config-naljal/egov-indexer/collection-indexer.yml,file:///work-dir/config-naljal/egov-indexer/egov-echallan.yml,file:///work-dir/config-naljal/egov-indexer/egov-telemetry-indexer.yml,file:///work-dir/config-naljal/egov-indexer/error-queue.yml,file:///work-dir/config-naljal/egov-indexer/egov-vendor.yaml,file:///work-dir/config-naljal/egov-indexer/payment-indexer.yml,file:///work-dir/config-naljal/egov-indexer/finance-rolloutadotpion-indexer.yml,file:///work-dir/config-naljal/egov-indexer/property-services.yml,file:///work-dir/config-naljal/egov-indexer/water-service.yml,file:///work-dir/config-naljal/egov-indexer/water-services-meter.yml,file:///work-dir/config-naljal/egov-indexer/roll-out-dashboard-indexer.yml" + egov-indexer-yaml-repo-path: "file:///work-dir/config-naljal/egov-indexer/billingservices-indexer.yml,file:///work-dir/config-naljal/egov-indexer/collection-indexer.yml,file:///work-dir/config-naljal/egov-indexer/egov-echallan.yml,file:///work-dir/config-naljal/egov-indexer/egov-telemetry-indexer.yml,file:///work-dir/config-naljal/egov-indexer/error-queue.yml,file:///work-dir/config-naljal/egov-indexer/egov-vendor.yaml,file:///work-dir/config-naljal/egov-indexer/payment-indexer.yml,file:///work-dir/config-naljal/egov-indexer/finance-rolloutadotpion-indexer.yml,file:///work-dir/config-naljal/egov-indexer/property-services.yml,file:///work-dir/config-naljal/egov-indexer/water-service.yml,file:///work-dir/config-naljal/egov-indexer/water-services-meter.yml,file:///work-dir/config-naljal/egov-indexer/roll-out-dashboard-indexer.yml,file:///work-dir/config-naljal/egov-indexer/tenant-mdms-indexer.yml,file:///work-dir/config-naljal/egov-indexer/rate-mdms-indexer.yml" egov-enc-service: replicas: 2 @@ -459,7 +469,7 @@ egov-persister: memory_limits: "768Mi" images: - naljal/egov-persister - persist-yml-path: "file:///work-dir/config-naljal/egov-persister/billing-services-persist.yml,file:///work-dir/config-naljal/egov-persister/collection-migration-persister.yml,file:///work-dir/config-naljal/egov-persister/echallan.yml,file:///work-dir/config-naljal/egov-persister/egf-bill.yaml,file:///work-dir/config-naljal/egov-persister/egov-user-event-persister.yml,file:///work-dir/config-naljal/egov-persister/egov-workflow-v2-persister.yml,file:///work-dir/config-naljal/egov-persister/pdf-filestoreid-update.yml,file:///work-dir/config-naljal/egov-persister/pdf-generator.yml,file:///work-dir/config-naljal/egov-persister/pg-service-persister.yml,file:///work-dir/config-naljal/egov-persister/property-services.yml,file:///work-dir/config-naljal/egov-persister/pt-persist.yml,file:///work-dir/config-naljal/egov-persister/water-persist.yml,file:///work-dir/config-naljal/egov-persister/water-meter.yml,file:///work-dir/config-naljal/egov-persister/vendor-persister.yaml,file:///work-dir/config-naljal/egov-persister/apportion-persister.yml,file:///work-dir/config-naljal/egov-persister/property-services-registry.yml,file:///work-dir/config-naljal/egov-persister/department-entity-persister.yml,file:///work-dir/config-naljal/egov-persister/department-entity-migration-progress.yml,file:///work-dir/config-naljal/egov-persister/adapter-master-data-service.yml,file:///work-dir/config-naljal/egov-persister/sms-persister.yml,file:///work-dir/config-naljal/egov-persister/mdms-persister.yml,file:///work-dir/config-naljal/egov-persister/hrms-employee-persister.yml" + persist-yml-path: "file:///work-dir/config-naljal/egov-persister/billing-services-persist.yml,file:///work-dir/config-naljal/egov-persister/collection-migration-persister.yml,file:///work-dir/config-naljal/egov-persister/echallan.yml,file:///work-dir/config-naljal/egov-persister/egf-bill.yaml,file:///work-dir/config-naljal/egov-persister/egov-user-event-persister.yml,file:///work-dir/config-naljal/egov-persister/egov-workflow-v2-persister.yml,file:///work-dir/config-naljal/egov-persister/pdf-filestoreid-update.yml,file:///work-dir/config-naljal/egov-persister/pdf-generator.yml,file:///work-dir/config-naljal/egov-persister/pg-service-persister.yml,file:///work-dir/config-naljal/egov-persister/property-services.yml,file:///work-dir/config-naljal/egov-persister/pt-persist.yml,file:///work-dir/config-naljal/egov-persister/water-persist.yml,file:///work-dir/config-naljal/egov-persister/water-meter.yml,file:///work-dir/config-naljal/egov-persister/vendor-persister.yaml,file:///work-dir/config-naljal/egov-persister/apportion-persister.yml,file:///work-dir/config-naljal/egov-persister/property-services-registry.yml,file:///work-dir/config-naljal/egov-persister/department-entity-persister.yml,file:///work-dir/config-naljal/egov-persister/department-entity-migration-progress.yml,file:///work-dir/config-naljal/egov-persister/adapter-master-data-service.yml,file:///work-dir/config-naljal/egov-persister/sms-persister.yml,file:///work-dir/config-naljal/egov-persister/mdms-persister.yml,file:///work-dir/config-naljal/egov-persister/hrms-employee-persister.yml,file:///work-dir/config-naljal/egov-persister/boundary-bulk-persister.yml,file:///work-dir/config-naljal/egov-persister/boundary-persister.yml" initContainers: gitSync: repo: "git@github.com:ddws-org/config-naljal" @@ -504,8 +514,8 @@ pdf-service: gitSync: repo: "git@github.com:ddws-org/config-naljal" ##### Change repo url with Your fork Repo url branch: "assam" ##### Change repo branch with Your fork Repo branch - data-config-urls: "file:///work-dir/config-naljal/pdf-service/data-config/ws-bill.json,file:///work-dir/config-naljal/pdf-service/data-config/ws-bill-nm.json,file:///work-dir/config-naljal/pdf-service/data-config/ws-receipt.json,file:///work-dir/config-naljal/pdf-service/data-config/ws-receipt-nm.json" - format-config-urls: "file:///work-dir/config-naljal/pdf-service/format-config/ws-bill.json,file:///work-dir/config-naljal/pdf-service/format-config/ws-bill-nm.json,file:///work-dir/config-naljal/pdf-service/format-config/ws-receipt.json,file:///work-dir/config-naljal/pdf-service/format-config/ws-receipt-nm.json" + data-config-urls: "file:///work-dir/config-naljal/pdf-service/data-config/ws-bill.json,file:///work-dir/config-naljal/pdf-service/data-config/ws-bill-nm.json,file:///work-dir/config-naljal/pdf-service/data-config/ws-receipt.json,file:///work-dir/config-naljal/pdf-service/data-config/ws-receipt-nm.json,file:///work-dir/config-naljal/pdf-service/data-config/ws-bill-nm-v2.json,file:///work-dir/config-naljal/pdf-service/data-config/ws-bill-v2.json" + format-config-urls: "file:///work-dir/config-naljal/pdf-service/format-config/ws-bill.json,file:///work-dir/config-naljal/pdf-service/format-config/ws-bill-nm.json,file:///work-dir/config-naljal/pdf-service/format-config/ws-receipt.json,file:///work-dir/config-naljal/pdf-service/format-config/ws-receipt-nm.json,file:///work-dir/config-naljal/pdf-service/format-config/ws-bill-nm-v2.json,file:///work-dir/config-naljal/pdf-service/format-config/ws-bill-v2.json" # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> diff --git a/deploy-as-code/helm/environments/uat.yaml b/deploy-as-code/helm/environments/uat.yaml new file mode 100644 index 000000000..d1ffd2a22 --- /dev/null +++ b/deploy-as-code/helm/environments/uat.yaml @@ -0,0 +1,969 @@ +global: + domain: naljalseva.jjm.gov.in + setup: fullsetup + namespace: uat + context: + path: uat + list: + - adapter-master-data-service + - billing-service + - collection-services + - dashboard-analytics + - echallan-services + - egov-filestore + - egov-localization + - egov-location + - egov-mdms-service + - mdms-v2 + - egov-pg-service + - egov-user + - egov-hrms + - egov-user-event + - egov-url-shortening + - ifix-department-entity-service + - pdf-service + - property-services + - ws-services + - ws-calculator + - vendor + - user-otp + - pgadmin + - frontend-mgramseva + - s3-proxy + - mgramseva-web + - kibana-v1 + - grafana + - jaeger + - oauth2-proxy + - egov-accesscontrol + - workbench-ui + + +cluster-configs: + secrets: + db: + namespace: [uat] + name: db + + egov-notification-sms: + namespace: uat + name: egov-notification-sms + + egov-filestore: + namespace: uat + name: egov-filestore + + egov-location: + namespace: uat + name: egov-location + + egov-pg-service: + namespace: uat + name: egov-pg-service + + egov-enc-service: + namespace: uat + name: egov-enc-service + + egov-notification-mail: + namespace: uat + name: egov-notification-mail + + home-isolation-notification-mail: + namespace: uat + name: home-isolation-notification-mail + + git-sync: + namespace: [uat , monitoring] + name: git-creds + + kibana: + namespace: uat + name: kibana-creds + + kibana-infra: + namespace: uat + name: kibana-infra-creds + + pgadmin: + namespace: playground + name: pgadmin + + egov-si-microservice: + namespace: uat + name: egov-si-microservice + + egov-edcr-notification: + namespace: uat + name: egov-edcr-notification + + egov-edcr-bank-gateway: + namespace: uat + name: egov-edcr-bank-gateway + + chatbot: + namespace: uat + name: chatbot + + covid-chatbot: + namespace: uat + name: covid-chatbot + + egov-user-chatbot: + namespace: uat + name: egov-user-chatbot + + oauth2-proxy: + namespace: uat + name: oauth2-proxy + + case-management: + namespace: uat + name: case-management + + alertmanager: + namespace: monitoring + name: alertmanager-main + namespaces: + create: true + values: [ backbone, cert-manager, monitoring, playground, kafka-kraft, es-cluster, es-cluster-infra, uat, kafka-cluster ] + + root-ingress: + cert-issuer: letsencrypt-prod + namespace: uat + context: /uat + redirect: /uat/mgramseva + + configmaps: + egov-config: + namespace: [ uat, monitoring ] + data: + db-host: naljal-prod-db.c7a9hnasyeda.ap-south-1.rds.amazonaws.com:5432 + db-name: naljaluatdb + db-url: jdbc:postgresql://naljal-prod-db.c7a9hnasyeda.ap-south-1.rds.amazonaws.com:5432/naljaluatdb?currentSchema=assam + db-schema: "assam" + domain: naljalseva.jjm.gov.in ## Add your Domain Name + egov-services-fqdn-name: https://naljalseva.jjm.gov.in/ ## Add your Domain Name + egov-services-fqdn-name-sms: https://naljalseva.jjm.gov.in/uat/ + state-level-tenant-id: "as" + egov-state-level-tenant-id: "as" + s3-assets-bucket: "naljal-uat-s3" + es-host: "elasticsearch-master.es-cluster" + es-indexer-host: "https://elasticsearch-master.es-cluster:9200/" + flyway-locations: "filesystem:/flyway/sql,filesystem:/flyway/seed,filesystem:/flyway/qa" + kafka-brokers: "kafka-kraft-controller-headless.kafka-kraft:9092" + kafka-infra-brokers: kafka-v2-infra.kafka-cluster:9092 + logging-level-jdbc: "DEBUG" + mobile-validation-workaround: "true" + serializers-timezone-in-ist: "true" + server-tomcat-max-connections: "500" + server-tomcat-max-threads: "10" + sms-enabled: "true" + spring-datasource-tomcat-initialSize: "1" + spring-datasource-tomcat-max-active: "2" + spring-jpa-show-sql: "true" + timezone: Asia/Kolkata + tracer-errors-provideexceptionindetails: "true" + egov-bnd-freedownload-tenants: "pg.testing" + egov-bnd-live-citizen-tenants: "pg.testing" + + egov-service-host: + namespace: [ uat, monitoring ] + data: + boundary-bulk-bff: "http://boundary-bulk-bff.uat:8080/" + boundary-service: "http://boundary-service.uat:8080/" + asset-services: "http://asset-services:8080/" + asset-services-maha: "http://asset-services-maha:8080/" + billing-service: "http://billing-service:8080/uat/" + collection-services: "http://collection-services:8080/uat/" + collection-masters: "http://collection-masters:8080/" + collection-search-indexer: "http://collection-search-indexer:8080/" + citizen-indexer: "http://citizen-indexer:8080/" + citizen-services: "http://citizen-services:8080/" + dashboard-analytics: "http://dashboard-analytics.uat:8080/uat/" + dashboard-ingest: "http://dashboard-ingest.uat:8080/" + demand-services: "http://demand-services:8080/" + data-sync-employee: "http://data-sync-employee:8080/" + egov-common-masters: "http://egov-common-masters:8080/" + egf-masters: "http://egf-masters:8080/" + egf-master: "http://egf-master:8080/" + egf-instrument: "http://egf-instrument:8080/" + egf-voucher: "http://egf-voucher:8080/" + egf-bill: "http://egf-bill:8080/" + egov-hrms: "http://egov-hrms:8080/uat/" + egov-enc-service: "http://egov-enc-service.uat:8080/" + egf-voucher-workflow: "http://egf-voucher-workflow:8080/" + egov-accesscontrol: "http://egov-accesscontrol:8080/uat/" + egov-user: "http://egov-user:8080/uat/" + egov-user-egov: "http://egov-user.uat:8080/uat/" + egov-location: "http://egov-location:8080/uat/" + egov-filestore: "http://egov-filestore:8080/uat/" + egov-localization: "http://egov-localization:8080/uat/" + egov-idgen: "http://egov-idgen:8080/" + egov-otp: "http://egov-otp:8080/" + egov-common-workflows: "http://egov-common-workflows:8080/" + egov-mdms-service: "http://mdms-v2:8080/uat/" + egov-mdms-service-test: "http://egov-mdms-service-test:8080/" + egov-mdms-create: "http://egov-mdms-create:8080/" + egov-eis: "http://egov-eis:8080/" + egov-workflow: "http://egov-workflow:8080/" + egov-workflow-v2: "http://egov-workflow-v2.uat:8080/" + egov-searcher: "http://egov-searcher:8080/" + egov-data-uploader: "http://egov-data-uploader:8080/" + egov-indexer: "http://egov-indexer:8080/" + egov-pg-service: "http://egov-pg-service:8080/uat/" + es-client: "http://elasticsearch-data.es-cluster:9200" + hr-masters: "http://hr-masters:8080/" + hr-employee: "http://hr-employee:8080/" + hr-masters-v2: "http://hr-masters-v2:8080/" + hr-employee-v2: "http://hr-employee-v2:8080/" + hr-attendance: "http://hr-attendance:8080/" + hr-leave: "http://hr-leave:8080/" + hr-employee-movement: "http://hr-employee-movement:8080/" + ifix-reference-adapter: "http://ifix-reference-adapter.uat:8080/" + inventory-services: "http://inventory-services:8080/" + lams-services: "http://lams-services:8080/" + lcms-workflow: "http://lcms-workflow:8080/" + lcms-services: "http://lcms-services:8080/" + location: "http://location:8080/" + mgramseva-ifix-adapter: "http://mgramseva-ifix-adapter.uat:8080/" + performance-assessment: "http://performance-assessment:8080/" + pt-property: "http://pt-property:8080/" + pt-workflow: "http://pt-workflow:8080/" + pt-tax-enrichment: "http://pt-tax-enrichment:8080/" + pt-calculator: "http://pt-calculator:8080/" + pt-calculator-v2: "http://pt-calculator-v2:8080/" + pt-services-v2: "http://pt-services-v2:8080/" + property-services: "http://property-services.uat:8080/uat/" + pgr-master: "http://pgr-master:8080/" + pgr-rest: "http://pgr-rest:8080/" + pdf-service: "http://pdf-service.uat:8080/uat/" + report: "http://report:8080/" + swm-services: "http://swm-services:8080/" + tenant: "http://tenant:8080/" + tl-masters: "http://tl-masters:8080/" + tl-services: "http://tl-services:8080/" + tl-workflow: "http://tl-workflow:8080/" + tl-indexer: "http://tl-indexer:8080/" + tl-calculator: "http://tl-calculator:8080/" + user-otp: "http://user-otp:8080/uat/" + firenoc-services: "http://firenoc-services:8080/" + firenoc-calculator: "http://firenoc-calculator:8080/" + egov-apportion-service: "http://egov-apportion-service:8080/" + bpa-services: "http://bpa-services.uat:8080/" + bpa-calculator: "http://bpa-calculator.uat:8080/" + rainmaker-pgr: "http://rainmaker-pgr:8080/" + ws-calculator: "http://ws-calculator.uat:8080/uat/" + ws-services: "http://ws-services.uat:8080/uat/" + sw-services: "http://sw-services.uat:8080/" + sw-calculator: "http://sw-calculator.uat:8080/" + land-services: "http://land-services.uat:8080/" + noc-services: "http://noc-services.uat:8080/" + minio-url: "https://minio-uat.digit.org/" + egov-user-chatbot: "http://egov-user-chatbot:8080/" + zuul: "http://zuul:8080/" + egov-url-shortening: "http://egov-url-shortening:8080/uat/" + fsm-calculator: "http://fsm-calculator.uat:8080/" + fsm: "http://fsm.uat:8080/" + vehicle: "http://vehicle.uat:8080" + vendor: "http://vendor.uat:8080/uat" + egov-edcr: "http://egov-edcr.uat:8080/" + echallan-calculator: "http://echallan-calculator.uat:8080/" + echallan-services: "http://echallan-services.uat:8080/uat/" + inbox: "http://inbox.uat:8080/" + turn-io-adapter: "http://turn-io-adapter.uat:8080/" + pgr-services: "http://pgr-services.uat:8080/" + birth-death-services: "http://birth-death-services.uat:8080/" + egov-pdf: "http://egov-pdf.uat:8080/" + mdms-v2: "http://mdms-v2:8080/uat/" +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: | + sub_filter.conf: " + sub_filter '' ' + + + ';" +digit-ui: + custom-js-injection: | + sub_filter.conf: " + sub_filter '' ' + + ';" +citizen: + custom-js-injection: | + sub_filter.conf: " + sub_filter '' ' + + + ';" + +frontend-mgramseva: + replicas: 1 + ingress: + context: "mgramseva" + state-level-tenant-id: as + custom-js-injection: | + sub_filter.conf: "sub_filter '' '';" + +mgramseva-web: + custom-js-injection: | + sub_filter.conf: " + sub_filter '' ' + + ';" + +# workbench-ui >>>>>>>>>>>>>>>>>>>>>>>>>>> +workbench-ui: + custom-js-injection: | + sub_filter.conf: " + sub_filter '' ' + + ';" + +property-services: + replicas: 10 + memory_limits: 1024Mi + heap: "-Xmx512m -Xms512m" + egov-mdms-search-endpoint: "/mdms-v2/v1/_search" + egov-shortener-url: "eus/shortener" + egov-url-shortener-endpoint: "/eus/shortener" + +boundary-service: + egov-mdms-search-endpoint: "/mdms-v2/v1/_search" + egov-mdms-create-endpoint: "/mdms-v2/v2/_create" + +mdms-v2: + replicas: 10 + memory_limits: 1024Mi + heap: "-Xmx512m -Xms512m" + +egov-filestore: + memory_limits: 512Mi + heap: "-Xmx512m -Xms512m" + volume: /opt/eGov/filestore + is-bucket-fixed: "true" + minio.url : "http://minio.backbone:9000/" + aws.s3.url : "https://s3.amazonaws.com" + is-s3-enabled: "true" + minio-enabled: false + allowed-file-formats-map: "{jpg:{'image/jpg','image/jpeg'},jpeg:{'image/jpeg','image/jpg'},png:{'image/png'},pdf:{'application/pdf'},odt:{'application/vnd.oasis.opendocument.text'},ods:{'application/vnd.oasis.opendocument.spreadsheet'},docx:{'application/x-tika-msoffice','application/x-tika-ooxml','application/vnd.oasis.opendocument.text','application/msword'},doc:{'application/x-tika-msoffice','application/x-tika-ooxml','application/vnd.oasis.opendocument.text','application/msword'},dxf:{'text/plain','application/dxf','application/octet-stream','image/vnd.dxf','image/vnd.dxf; format=ascii','image/vnd.dxf; format=binary','image/vnd.dxb'},csv:{'text/plain'},txt:{'text/plain'},xlsx:{'application/x-tika-ooxml','application/x-tika-msoffice','application/vnd.ms-excel','application/vnd.openxmlformats-officedocument.spreadsheetml.sheet','application/zip','multipart/form-data'},xls:{'application/x-tika-ooxml','application/x-tika-msoffice','application/vnd.ms-excel','multipart/form-data'}}" + allowed-file-formats: "jpg,jpeg,png,doc,docx,pdf,odt,ods,text,dxf,xls,xlsx" + filestore-url-validity: 3600 + fixed-bucketname: naljal-uat-s3 + +egov-idgen: + replicas: 2 + heap: "-Xmx512m -Xms512m" + memory_limits: "768Mi" + idformat-from-mdms: "true" + java-args: -Dspring.profiles.active=monitoring + autocreate-new-seq: "true" + mdms-service-search-uri: "mdms-v2/v1/_search" + +egov-notification-sms: + egov-notification-sms: + sms-provider-url: "https://smsgw.sms.gov.in/failsafe/MLink" + sms.provider.url: "https://smsgw.sms.gov.in/failsafe/MLink" + sms.provider.class: "Console" + sms.provider.requestType: "POST" + sms.provider.contentType: "application/json" + sms-config-map: "{'username':'$username', 'pin': '$password', 'signature':'$senderid', 'mnumber':'$mobileno', 'message':'$message', 'smsservicetype':'unicodemsg', 'myParam': '$extraParam' , 'messageType': '$mtype'}" + sms-gateway-to-use: "NIC" + sms-sender: "PBDWSS" + sms.senderid: "PBDWSS" + sms-sender-requesttype: "GET" + sms-custom-config: "true" + sms-extra-req-params: "mtype=N&DR=Y" + sms-sender-req-param-name: "sid" + sms-sender-username-req-param-name: "User" + sms-sender-password-req-param-name: "passwd" + sms-destination-mobile-req-param-name: "mobilenumber" + sms-message-req-param-name: "message" + sms-error-codes: "401,403,404,405,406,407,408,409,410,411,412,413,414" + sms.verify.certificate: "false" + sms.msg.append: "" + sms.provider.entityid: "1001842650153206278" + sms.default.tmplid: "1" + sms.debug.msggateway: "true" + sms.enabled: "true" + save-sms-entity-enabled: "true" + sms-disabled-tenants-list: "pb.testing" + +egov-user: + replicas: 3 + heap: "-Xmx256m -Xms256m" + memory_limits: 512Mi + otp-validation: "true" + citizen-otp-enabled: "true" + employee-otp-enabled: "false" + access-token-validity: 10080 + refresh-token-validity: 20160 + default-password-expiry: 90 + mobile-number-validation: "false" + roles-state-level: "true" + citizen-registration-withlogin: "true" + citizen-otp-fixed: "123456" + citizen-otp-fixed-enabled: "true" + egov-state-level-tenant-id: "as" + account-unlock-cool-down-period-minutes: 5 + egov-mdms-search-endpoint: "/mdms-v2/v1/_search" + mdms-path: "/mdms-v2/v1/_search" + +chatbot: + kafka-topics-partition-count: 3 + kafka-topics-replication-factor: 2 + kafka-consumer-poll-ms: 10 + kafka-producer-linger-ms: 5 + + contact-card-whatsapp-number: "+918744960111" + contact-card-whatsapp-name: "mSeva Punjab" + valuefirst-whatsapp-number: "918744960111" + valuefirst-notification-assigned-templateid: "194781" + valuefirst-notification-resolved-templateid: "194783" + valuefirst-notification-rejected-templateid: "194785" + valuefirst-notification-reassigned-templateid: "194787" + valuefirst-notification-commented-templateid: "194789" + valuefirst-notification-welcome-templateid: "194791" + valuefirst-notification-root-templateid: "194795" + valuefirst-send-message-url: "https://api.myvaluefirst.com/psms/servlet/psms.JsonEservice" + + user-service-chatbot-citizen-passwrord: "123456" + +billing-service: + replicas: 1 + memory_limits: 512Mi + demand.updateurl: '{"WS":"http://ws-calculator.uat:8080/uat/ws-calculator/waterCalculator/_updateDemand"}' + sms-bill-notification-enable: false + egov-mdms-search-endpoint: "/mdms-v2/v1/_search" + +ws-services: + wcid-format: "WS/[CITY.CODE]/[fy:yyyy-yy]/[SEQ_EGOV_COMMON]" + is-external-workflow-enabled: "true" + replicas: 8 + heap: "-Xmx512m -Xms512m" + memory_limits: "768Mi" + sms-pending-collection-enabled: false + sms-todays-collection-enabled: false + sms-edit-water-connection-notification-enabled: false + sms-payment-notification-enabled: true + sms-workflow-enabled: false + sms-feedback-notification-enabled: false + egov-mdms-search-endpoint: "/mdms-v2/v1/_search" + egov-shortener-url: "eus/shortener" + egov-url-shortener-endpoint: "/eus/shortener" + report-in-chronological-order: true + +egov-location: + memory_limits: 512Mi + replicas: 1 + +vendor: + vendor.role: CITIZEN + vendor.driver: CITIZEN + vendor.role.name: Vendor role Citizen + vendor.driver.role.name: Vendor Driver Role Citizen + replicas: 1 + egov-mdms-search-endpoint: "/mdms-v2/v1/_search" + +echallan-services: + replicas: 1 + heap: "-Xmx512m -Xms512m" + memory_limits: "768Mi" + egov-idgen-challanNum-format: "EB-[fy:yyyy-yy]-[SEQ_EG_ECHALLAN_EXPENSE]" + sms-expenditure-enabled: false + sms-expenditure-mark-bill-enabled: false + sms-monthy-summary-enabled: false + egov-mdms-search-endpoint: "/mdms-v2/v1/_search" + egov.shortener.url: "eus/shortener" + egov.url.shortner.endpoint: "/eus/shortener" + +ws-calculator: + replicas: 3 + heap: "-Xmx512m -Xms512m" + memory_limits: "768Mi" + sms-demand-enabled: true + sms-payment-link-enabled: false + sms-bill-download-enable: true + egov-mdms-search-endpoint: "/mdms-v2/v1/_search" + egov-shortener-url: "eus/shortener" + egov-url-shortener-endpoint: "/eus/shortener" + penalty-applicable-in-days: 10 + penalty-start-threshold-time: "1680285630000" + is-penalty-feature-enable: true + is-save-demand-audit-enabled: true + egov-save-demand-audit-from-wscal: "save-ws-demand-change-audit" + +egov-pg-service: + replicas: 1 + heap: "-Xmx512m -Xms512m" + memory_limits: "768Mi" + axis: true + egov-pg-reconciliation-system-user-uuid: "db4fe8ed-c0e0-4c2a-829b-72296d8d156f" + egov-url-shortener-endpoint: "/eus/shortener" + +# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> +egov-mdms-service: + replicas: 1 + heap: "-Xmx512m -Xms512m" + memory_limits: "768Mi" + images: + - egovio/egov-mdms-service + mdms-path: "/work-dir/mdms-naljal/data" + initContainers: + gitSync: + repo: "git@github.com:ddws-org/mdms-naljal" ##### Change repo url with Your fork Repo url + branch: "naljal-uat" ##### Change repo branch with Your fork Repo branch + mdms-folder: "mdms-naljal" + masters-config-url: "file:///work-dir/mdms-naljal/master-config.json" + java-args: -Dspring.profiles.active=monitoring + +egov-indexer: + replicas: 1 + heap: "-Xmx512m -Xms512m" + memory_limits: "768Mi" + initContainers: + gitSync: + repo: "git@github.com:ddws-org/config-naljal" + branch: "UAT" + egov-indexer-yaml-repo-path: "file:///work-dir/config-naljal/egov-indexer/billingservices-indexer.yml,file:///work-dir/config-naljal/egov-indexer/collection-indexer.yml,file:///work-dir/config-naljal/egov-indexer/egov-echallan.yml,file:///work-dir/config-naljal/egov-indexer/egov-telemetry-indexer.yml,file:///work-dir/config-naljal/egov-indexer/error-queue.yml,file:///work-dir/config-naljal/egov-indexer/egov-vendor.yaml,file:///work-dir/config-naljal/egov-indexer/payment-indexer.yml,file:///work-dir/config-naljal/egov-indexer/finance-rolloutadotpion-indexer.yml,file:///work-dir/config-naljal/egov-indexer/property-services.yml,file:///work-dir/config-naljal/egov-indexer/water-service.yml,file:///work-dir/config-naljal/egov-indexer/water-services-meter.yml,file:///work-dir/config-naljal/egov-indexer/hrms-indexer.yml,file:///work-dir/config-naljal/egov-indexer/roll-out-dashboard-indexer.yml,file:///work-dir/config-naljal/egov-indexer/tenant-mdms-indexer.yml,file:///work-dir/config-naljal/egov-indexer/rate-mdms-indexer.yml" + +egov-enc-service: + replicas: 1 + heap: "-Xmx512m -Xms512m" + memory_limits: "768Mi" + java-args: -Dspring.profiles.active=monitoring + state-level-tenant-id: "as" + egov-mdms-search-endpoint: "/mdms-v2/v1/_search" + +egov-persister: + replicas: 3 + heap: "-Xmx512m -Xms512m" + memory_limits: "768Mi" + images: + - naljal/egov-persister + persist-yml-path: "file:///work-dir/config-naljal/egov-persister/billing-services-persist.yml,file:///work-dir/config-naljal/egov-persister/collection-migration-persister.yml,file:///work-dir/config-naljal/egov-persister/echallan.yml,file:///work-dir/config-naljal/egov-persister/egf-bill.yaml,file:///work-dir/config-naljal/egov-persister/egov-user-event-persister.yml,file:///work-dir/config-naljal/egov-persister/egov-workflow-v2-persister.yml,file:///work-dir/config-naljal/egov-persister/pdf-filestoreid-update.yml,file:///work-dir/config-naljal/egov-persister/pdf-generator.yml,file:///work-dir/config-naljal/egov-persister/pg-service-persister.yml,file:///work-dir/config-naljal/egov-persister/property-services.yml,file:///work-dir/config-naljal/egov-persister/pt-persist.yml,file:///work-dir/config-naljal/egov-persister/water-persist.yml,file:///work-dir/config-naljal/egov-persister/water-meter.yml,file:///work-dir/config-naljal/egov-persister/vendor-persister.yaml,file:///work-dir/config-naljal/egov-persister/apportion-persister.yml,file:///work-dir/config-naljal/egov-persister/property-services-registry.yml,file:///work-dir/config-naljal/egov-persister/department-entity-persister.yml,file:///work-dir/config-naljal/egov-persister/department-entity-migration-progress.yml,file:///work-dir/config-naljal/egov-persister/adapter-master-data-service.yml,file:///work-dir/config-naljal/egov-persister/sms-persister.yml,file:///work-dir/config-naljal/egov-persister/mdms-persister.yml,file:///work-dir/config-naljal/egov-persister/hrms-employee-persister.yml,file:///work-dir/config-naljal/egov-persister/boundary-bulk-persister.yml,file:///work-dir/config-naljal/egov-persister/boundary-persister.yml" + initContainers: + gitSync: + repo: "git@github.com:ddws-org/config-naljal" + branch: "UAT" ##### Change repo branch with Your fork Repo branch + +pgr-services: + memory_limits: 512Mi + +egov-data-uploader: + initContainers: + gitSync: + repo: "git@github.com:ddws-org/config-naljal" ##### Change repo url with Your fork Repo url + branch: "UAT" ##### Change repo branch with Your fork Repo branch + +egov-searcher: + search-yaml-path: "file:///work-dir/config-naljal/egov-searcher/bill-genie.yml,file:///work-dir/config-naljal/egov-searcher/wateropensearch.yml,file:///work-dir/config-naljal/egov-searcher/localitySearcher.yml,file:///work-dir/config-naljal/egov-searcher/propertyopensearch.yml" + initContainers: + gitSync: + repo: "git@github.com:ddws-org/config-naljal" + branch: "UAT" ##### Change repo branch with Your fork Repo branch + +dashboard-analytics: + config-schema-paths: "file:///work-dir/config-naljal/egov-dss-dashboards/dashboard-analytics/*.json" + initContainers: + gitSync: + repo: "git@github.com:ddws-org/config-naljal" + branch: "UAT" ##### Change repo branch with Your fork Repo branch + +dashboard-ingest: + config-schema-paths: "file:///work-dir/config-naljal/egov-dss-dashboards/dashboard-ingest/*.json" + initContainers: + gitSync: + repo: "git@github.com:ddws-org/config-naljal" + branch: "UAT" ##### Change repo branch with Your fork Repo branch + +# reportinfra >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> + +national-dashboard-ingest: + heap: "-Xmx750m -Xms750m" + replicas: 1 + 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" + module-fields-mapping: '{"PT":{"transactions":"array::number","todaysTotalApplications":"number","todaysClosedApplications":"number","assessments":"number","assessedProperties":"array::number","propertiesRegistered":"array::number","todaysCollection":"array::number","propertyTax":"array::number","cess":"array::number","rebate":"array::number","penalty":"array::number","interest":"array::number"},"TL":{"transactions":"number","todaysApplications":"number","todaysLicenseIssuedWithinSLA":"number","tlTax":"number","adhocPenalty":"number","adhocRebate":"number","todaysCollection":"array::number","todaysTradeLicenses":"array::number","applicationsMovedToday":"array::number"},"PGR":{"uniqueCitizens":"number","todaysComplaints":"array::number","todaysReopenedComplaints":"array::number","todaysOpenComplaints":"array::number","todaysAssignedComplaints":"array::number","todaysRejectedComplaints":"array::number","todaysReassignedComplaints":"array::number","todaysReassignRequestedComplaints":"array::number","todaysClosedComplaints":"array::number","todaysResolvedComplaints":"array::number","slaAchievement":"array::number","completionRate":"array::number","averageSolutionTime":"array::number"},"WS":{"transactions":"number","connectionsCreated":"array::number","todaysCollection":"array::number","sewerageConnections":"array::number","waterConnections":"array::number","pendingConnections":"array::number","slaCompliance":"number","todaysTotalApplications":"number","todaysClosedApplications":"number","todaysCompletedApplicationsWithinSLA":"number"},"MCOLLECT":{"numberOfCategories":"number","todaysCollection":"array::number","numberOfReceipts":"array::number","numberOfChallans":"array::number"},"OBPS":{"ocPlansScrutinized":"number","plansScrutinized":"number","ocSubmitted":"number","applicationsSubmitted":"number","ocIssued":"number","landAreaAppliedInSystemForBPA":"number","averageDaysToIssuePermit":"number","averageDaysToIssueOC":"number","todaysCollection":"array::number","permitsIssued":"array::number","todaysClosedApplicationsOC":"number","todaysCompletedApplicationsWithinSLAOC":"number","todaysClosedApplicationsPermit":"number","todaysCompletedApplicationsWithinSLAPermit":"number","slaComplianceOC":"number","slaCompliancePermit":"number","applicationsWithDeviation":"number","averageDeviation":"number","ocWithDeviation":"number"},"FIRENOC":{"todaysApplications":"array::number","todaysCollection":"array::number","nocIssuedToday":"array::number","provisionalNOCIssued":"array::number","actualNOCIssued":"array::number","avgDaysToIssueProvisionalNOC":"array::number","slaComplianceActual":"array::number","slaComplianceProvisional":"array::number","avgDaysToIssueActualNOC":"array::number","todaysClosedApplications":"number","todaysCompletedApplicationsWithinSLA":"number"},"COMMON":{"onboardedUlbsCount":"number","totalCitizensCount":"number","slaAchievement":"number","liveUlbsCount":"array::number","status":"string","totalLiveUlbsCount":"number","totalUlbCount":"number"},"BIRTH":{"todaysCollection":"array::number","numberOfCertificatesDownloadedToday":"array::number","numberOfBirthsToday":"array::number"},"DEATH":{"todaysCollection":"array::number","numberOfCertificatesDownloadedToday":"array::number","numberOfDeathsToday":"array::number"}}' + master-module-fields-mapping: '{"PT":{"snoForMunicipalCorporation":"string","ulbName":"string","date":"string","budgetProposedForMunicipalCorporation":"number"},"PGR":{"snoForMunicipalCorporation":"string","ulbName":"string","date":"string","budgetProposedForMunicipalCorporation":"number"},"TL":{"snoForMunicipalCorporation":"string","ulbName":"string","date":"string","budgetProposedForMunicipalCorporation":"number"},"WS":{"snoForMunicipalCorporation":"string","ulbName":"string","date":"string","budgetProposedForMunicipalCorporation":"number"},"MCOLLECT":{"snoForMunicipalCorporation":"string","ulbName":"string","date":"string","budgetProposedForMunicipalCorporation":"number"},"OBPS":{"snoForMunicipalCorporation":"string","ulbName":"string","date":"string","budgetProposedForMunicipalCorporation":"number"},"FIRENOC":{"snoForMunicipalCorporation":"string","ulbName":"string","date":"string","budgetProposedForMunicipalCorporation":"number"},"BIRTH":{"snoForMunicipalCorporation":"string","ulbName":"string","date":"string","budgetProposedForMunicipalCorporation":"number"},"DEATH":{"snoForMunicipalCorporation":"string","ulbName":"string","date":"string","budgetProposedForMunicipalCorporation":"number"}}' + module-allowed-groupby-fields-mapping: '{"PT":{"financialYear","usageCategory"},"WS":{"connectionType","channelType","usageType","paymentChannelType","taxHeads","meterType","duration"},"FIRENOC":{"applicationType","department","paymentMode","type","usageType"},"OBPS":{"paymentMode","riskType","occupancyType","subOccupancyType"},"PGR":{"status","channel","department","category"},"TL":{"tradeType","status"},"MCOLLECT":{"paymentMode","status","category","challanStatus"},"COMMON":{"serviceModuleCode"},"BIRTH":{"channel","gender","boundary"},"DEATH":{"channel","gender","boundary","age"}}' + +report: + heap: "-Xmx512m -Xms512m" + tracing-enabled: "true" + spring-datasource-tomcat-max-active: 5 + initContainers: + gitSync: + repo: "git@github.com:ddws-org/config-naljal" ##### Change repo url with Your fork Repo url + branch: "UAT" ##### Change repo branch with Your fork Repo branch + report-locationsfile-path: "file:///work-dir/config-naljal/reports/reportFileLocationsv1.txt" + +pdf-service: + initContainers: + gitSync: + repo: "git@github.com:ddws-org/config-naljal" ##### Change repo url with Your fork Repo url + branch: "UAT" ##### Change repo branch with Your fork Repo branch + data-config-urls: "file:///work-dir/config-naljal/pdf-service/data-config/ws-bill.json,file:///work-dir/config-naljal/pdf-service/data-config/ws-bill-nm.json,file:///work-dir/config-naljal/pdf-service/data-config/ws-receipt.json,file:///work-dir/config-naljal/pdf-service/data-config/ws-receipt-nm.json,file:///work-dir/config-naljal/pdf-service/data-config/ws-bill-nm-v2.json,file:///work-dir/config-naljal/pdf-service/data-config/ws-bill-v2.json" + format-config-urls: "file:///work-dir/config-naljal/pdf-service/format-config/ws-bill.json,file:///work-dir/config-naljal/pdf-service/format-config/ws-bill-nm.json,file:///work-dir/config-naljal/pdf-service/format-config/ws-receipt.json,file:///work-dir/config-naljal/pdf-service/format-config/ws-receipt-nm.json,file:///work-dir/config-naljal/pdf-service/format-config/ws-bill-nm-v2.json,file:///work-dir/config-naljal/pdf-service/format-config/ws-bill-v2.json" + +# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> + +# financials >>>>>>>>>>>>>>>>>>>>>>>>>>>> + +egf-master: + memory_limits: 512Mi + heap: "-Xmx256m -Xms256m" +# <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< +egov-custom-consumer: + erp-host: "https://mohali-qa.egovernments.org/" + +egov-apportion-service: + memory_limits: 512Mi + heap: -Xmx256m -Xms256m + egov-mdms-search-endpoint: "/mdms-v2/v1/_search" + +# docs >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> +redoc: + replicas: 1 + images: + - egovio/redoc:v1.0.5 + service_type: LoadBalancer +# <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< + +# gateway >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> + +ingress-nginx: + images: + - quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.26.1 + replicas: 1 + default-backend-service: "egov/nginx" + namespace: uat + cert-issuer: "letsencrypt-prod" + ssl-protocols: "TLSv1.2 TLSv1.3" + ssl-ciphers: "EECDH+CHACHA20:EECDH+AES" + ssl-ecdh-curve: "X25519:prime256v1:secp521r1:secp384r1" + +cert-manager: + email: "devops@egovernments.org" ### Add email-id which used by cert-manager for certificates validation. + + +gateway: + contextUnique: true + namespace: uat + replicas: 1 + custom-filter-property: "false" + tracing-enabled: "true" + heap: "-Xmx704m -Xms512m" + server-tomcat-max-threads: "350" + server-tomcat-max-connections: "1500" + egov-open-endpoints-whitelist: "/uat/egov-user-event/v1/events/_search,/uat/user/oauth/token,/uat/user-otp/v1/_send,/uat/otp/v1/_validate,/uat/user/citizen/_create,/uat/localization/messages,/uat/localization/messages/v1/_search,/uat/user/password/nologin/_update,/uat/pgr/servicedefinition/v1/_search,/uat/pgr/servicecategories/v1/_search,/uat/pgr/v1/otp/_send,/uat/pgr-master/receivingmode/v1/_search,/uat/tenant/v1/tenant/_search,/uat/egov-location/boundarys,/uat/egov-location/boundarys/boundariesByBndryTypeNameAndHierarchyTypeName,/uat/pgr-master/service/v1/_search,/uat/egov-location/boundarys/getLocationByLocationName,/uat/pgr-master/OTPConfig/_search,/uat/pgr-master/serviceGroup/v1/_search,/uat/egov-location/boundarys/isshapefileexist,/uat/pgr/services/v1/_search,/uat/hr-masters/hrconfigurations/_search,/uat/collection-services/receipts/_view,/uat/pgr-master/service/v2/_search,/uat/pgr-master/servicedefinition/v1/_search,/uat/citizen-services,/uat/citizen-services/v1/requests/receipt/_create,/uat/citizen-services/v1/pgresponse,/uat/citizen-services/v1/requests/anonymous/_search,/uat/egov-mdms-service/v1/_search,/uat/egov-mdms-service/v1/_get,/uat/egov-mdms-service/v1/_reload,/uat/egov-mdms-service/v1/_reloadobj,/uat/egov-location/boundarys/getshapefile,/uat/egov-indexer/index-operations/_index,/uat/egov-indexer/index-operations/_reload,/uat/egov-mdms-service-test/v1/_search,/uat/egov-mdms-create/v1/_update,/uat/egov-mdms-create/v1/_create,/uat/egov-mdms-service-test/v1/_reload,/uat/filestore/v1/files/url,/uat/eus,/uat/adapter-master-data/department/v1/_search,/uat/ifix-department-entity/departmentEntity/hierarchyLevel/v1/_search,/uat/ifix-department-entity/departmentEntity/v1/_search,/uat/adapter-master-data/project/v1/_create,/uat/adapter-master-data/project/v1/_search,/uat/egov-location/location/v11/boundarys/_search,/uat/mdms-v2/v1/_search,/uat/mdms-v2/schema/v1/_search,/uat/mdms-v2/v1/_get,/uat/filestore/v1/files" + egov-mixed-mode-endpoints-whitelist: "/uat/egov-user-event/v1/events/_search,/uat/pgr/seva/v1/_create,/uat/pgr/seva/v1/_search,/uat/pgr/seva/v1/_count,/uat/workflow/history/v1/_search,/uat/filestore/v1/files/id,/uat/filestore/v1/files/tag,/uat/egov-common-masters/departments/_search,/uat/pt-property/property/propertytypes/_search,/uat/pt-property/properties/_search,/uat/pt-property/property/usages/_search,/uat/egov-idgen/id/_generate,/uat/egf-masters/financialyears/_search,/uat/egov-common-workflows/process/_start,/uat/egov-common-workflows/process/_search,/uat/egov-common-workflows/tasks,/uat/egov-common-workflows/tasks/{id}/_update,/uat/user/_search,/uat/billing-service/demand/_dues,/uat/billing-service/bill/_generate,/uat/billing-service/demand/_create,/uat/wcms/masters/waterchargesconfig/_search,/uat/wcms/masters/usagetypes/_search,/uat/wcms/masters/pipesizes/_search,/uat/wcms-connection/connection/_getbillingtypes,/uat/wcms-connection/connection/_getconnectiontypes,/uat/wcms/masters/sourcetypes/_search,/uat/wcms/masters/supplytypes/_search,/uat/wcms/masters/storagereservoirs/_search,/uat/wcms/masters/treatmentplants/_search,/uat/wcms/masters/documenttypes-applicationtypes/_search,/uat/wcms/masters/donations/_search,/uat/wcms/masters/nonmeterwaterrates/_search,/uat/wcms-connection/connection/_create,/uat/egov-common-masters/genders/_search,/uat/egov-common-workflows/designations/_search,/uat/access/v1/actions/mdms/_get,/uat/tl-services/v1/BPAREG/_create,/uat/tl-services/v1/BPAREG/_update,/uat/tl-calculator/v1/BPAREG/_getbill,/uat/property-services/property/_search,/uat/billing-service/bill/v2/_search,/uat/pg-service/transaction/v1/_create,/uat/collection-services/payments/_search,/uat/pdf-service/v1/_create,/uat/billing-service/bill/v2/_fetchbill,/uat/pg-service/transaction/v1/_update,/uat/ws-services/wc/_bulkonboard,/uat/ws-services/wc/_submitfeedback,/uat/ws-services/wc/_search,/uat/collection-services/payments/WS/_search,/uat/ws-calculator/waterCalculator/_getPenaltyDetails,/uat/billing-service/demand/_search,/uat/collection-services/payments/_create,/uat/pg-service/transaction/v1/_redirect,/uat/adapter-master-data/project/v1/_search,/uat/billing-service/demand/_getAggregateDemandDetails,/uat/egov-hrms/employees/_searchListOfEmployee" + +zuul: + contextUnique: true + namespace: uat + replicas: 1 + custom-filter-property: "false" + tracing-enabled: "true" + heap: "-Xmx704m -Xms512m" + server-tomcat-max-threads: "350" + server-tomcat-max-connections: "1500" + egov-open-endpoints-whitelist: "/uat/egov-user-event/v1/events/_search,/uat/user/oauth/token,/uat/user-otp/v1/_send,/uat/otp/v1/_validate,/uat/user/citizen/_create,/uat/localization/messages,/uat/localization/messages/v1/_search,/uat/user/password/nologin/_update,/uat/pgr/servicedefinition/v1/_search,/uat/pgr/servicecategories/v1/_search,/uat/pgr/v1/otp/_send,/uat/pgr-master/receivingmode/v1/_search,/uat/tenant/v1/tenant/_search,/uat/egov-location/boundarys,/uat/egov-location/boundarys/boundariesByBndryTypeNameAndHierarchyTypeName,/uat/pgr-master/service/v1/_search,/uat/egov-location/boundarys/getLocationByLocationName,/uat/pgr-master/OTPConfig/_search,/uat/pgr-master/serviceGroup/v1/_search,/uat/egov-location/boundarys/isshapefileexist,/uat/pgr/services/v1/_search,/uat/hr-masters/hrconfigurations/_search,/uat/collection-services/receipts/_view,/uat/pgr-master/service/v2/_search,/uat/pgr-master/servicedefinition/v1/_search,/uat/citizen-services,/uat/citizen-services/v1/requests/receipt/_create,/uat/citizen-services/v1/pgresponse,/uat/citizen-services/v1/requests/anonymous/_search,/uat/egov-mdms-service/v1/_search,/uat/egov-mdms-service/v1/_get,/uat/egov-mdms-service/v1/_reload,/uat/egov-mdms-service/v1/_reloadobj,/uat/egov-location/boundarys/getshapefile,/uat/egov-indexer/index-operations/_index,/uat/egov-indexer/index-operations/_reload,/uat/egov-mdms-service-test/v1/_search,/uat/egov-mdms-create/v1/_update,/uat/egov-mdms-create/v1/_create,/uat/egov-mdms-service-test/v1/_reload,/uat/filestore/v1/files/url,/uat/eus,/uat/adapter-master-data/department/v1/_search,/uat/ifix-department-entity/departmentEntity/hierarchyLevel/v1/_search,/uat/ifix-department-entity/departmentEntity/v1/_search,/uat/adapter-master-data/project/v1/_create,/uat/adapter-master-data/project/v1/_search" + egov-mixed-mode-endpoints-whitelist: "/uat/egov-user-event/v1/events/_search,/uat/pgr/seva/v1/_create,/uat/pgr/seva/v1/_search,/uat/pgr/seva/v1/_count,/uat/workflow/history/v1/_search,/uat/filestore/v1/files/id,/uat/filestore/v1/files,/uat/filestore/v1/files/tag,/uat/egov-common-masters/departments/_search,/uat/pt-property/property/propertytypes/_search,/uat/pt-property/properties/_search,/uat/pt-property/property/usages/_search,/uat/egov-idgen/id/_generate,/uat/egf-masters/financialyears/_search,/uat/egov-common-workflows/process/_start,/uat/egov-common-workflows/process/_search,/uat/egov-common-workflows/tasks,/uat/egov-common-workflows/tasks/{id}/_update,/uat/user/_search,/uat/billing-service/demand/_dues,/uat/billing-service/bill/_generate,/uat/billing-service/demand/_create,/uat/wcms/masters/waterchargesconfig/_search,/uat/wcms/masters/usagetypes/_search,/uat/wcms/masters/pipesizes/_search,/uat/wcms-connection/connection/_getbillingtypes,/uat/wcms-connection/connection/_getconnectiontypes,/uat/wcms/masters/sourcetypes/_search,/uat/wcms/masters/supplytypes/_search,/uat/wcms/masters/storagereservoirs/_search,/uat/wcms/masters/treatmentplants/_search,/uat/wcms/masters/documenttypes-applicationtypes/_search,/uat/wcms/masters/donations/_search,/uat/wcms/masters/nonmeterwaterrates/_search,/uat/wcms-connection/connection/_create,/uat/egov-common-masters/genders/_search,/uat/egov-common-workflows/designations/_search,/uat/access/v1/actions/mdms/_get,/uat/tl-services/v1/BPAREG/_create,/uat/tl-services/v1/BPAREG/_update,/uat/tl-calculator/v1/BPAREG/_getbill,/uat/property-services/property/_search,/uat/billing-service/bill/v2/_search,/uat/egov-location/location/v11/boundarys/_search,/uat/pg-service/transaction/v1/_create,/uat/collection-services/payments/_search,/uat/pdf-service/v1/_create,/uat/billing-service/bill/v2/_fetchbill,/uat/pg-service/transaction/v1/_update,/uat/ws-services/wc/_bulkonboard,/uat/ws-services/wc/_submitfeedback,/uat/ws-services/wc/_search,/uat/collection-services/payments/WS/_search,/uat/ws-calculator/waterCalculator/_getPenaltyDetails,/uat/billing-service/demand/_search,/uat/collection-services/payments/_create,/uat/pg-service/transaction/v1/_redirect,/uat/adapter-master-data/project/v1/_search" + +# <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< + +collection-services: + replicas: 1 + memory_limits: 512Mi + receiptnumber-servicebased: "true" + receipt-search-paginate: "true" + receipt-search-defaultsize: 30 + user-create-enabled: "true" + egov-mdms-search-endpoint: "/mdms-v2/v1/_search" + +collection-receipt-voucher-consumer: + jalandhar-erp-host: "https://jalandhar-qa.egovernments.org/" + mohali-erp-host: "https://mohali-qa.egovernments.org/" + nayagaon-erp-host: "https://nayagaon-qa.egovernments.org/" + amritsar-erp-host: "https://amritsar-qa.egovernments.org/" + kharar-erp-host: "https://kharar-qa.egovernments.org/" + zirakpur-erp-host: "https://zirakpur-qa.egovernments.org/" + +finance-collections-voucher-consumer: + erp-env-name: "qa" + erp-domain-name: "egovernments.org" + + +user-otp: + logging-level: "DEBUG" + +# rainmaker-pgr >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> +rainmaker-pgr: + notification-sms-enabled: "true" + notification-email-enabled: "false" + new-complaint-enabled: "true" + reassign-complaint-enabled: "true" + reopen-complaint-enabled: "true" + comment-by-employee-notif-enabled: "false" + notification-allowed-status: "open,assigned,rejected,resolved" + +pt-services-v2: + pt-userevents-pay-link: "/citizen/otpLogin?mobileNo=$mobile&redirectTo=egov-common/pay?consumerCode=$consumerCode&tenantId=$tenantId" + +pt-calculator-v2: + logging-level: "DEBUG" + +tl-services: + heap: "-Xmx128m -Xms64m" + memory_limits: 384Mi + java-args: -Dspring.profiles.active=monitoring + tl-application-num-format: "APP-[SEQ_EG_TL_APL]" + tl-license-num-format: "MP-LEP-[SEQ_EG_PT_LN]" + tl-userevents-pay-link: "citizen/otpLogin?mobileNo=$mobile&redirectTo=egov-common/pay?consumerCode=$applicationNo&tenantId=$tenantId" + tl-payment-topic-name: "egov.collection.payment-create" + host-link: "https://egov-demo.egovernments.org/citizen/" + pdf-link: "https://egov-demo.egovernments.org/egov-pdf/download/epass?tenantId={TENANTID}&uuid={UUID}" + tl-search-default-limit: "100" + +egov-workflow-v2: + replicas: 3 + logging-level: "DEBUG" + java-args: -Dspring.profiles.active=monitoring + heap: "-Xmx256m -Xms256m" + workflow-statelevel: "true" + +egov-hrms: + java-args: -Dspring.profiles.active=monitoring + memory_limits: "512Mi" + employee-applink: "https://egov-demo.egovernments.org/employee/user/login" + sms-user-creation-enabled: true + egov-mdms-search-endpoint: "/mdms-v2/v1/_search" + + + +# <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< + +kafka-config: + topics: "egov.pgr.validated:1:1,egov.pgr.locationupdated:1:1,egov.pgr.workflowupdated:1:1,egov.pgr.saved:1:1,egov.pgr.indexing:1:1,egov.core.notification.email:1:1,egov.core.notification.sms:1:1,attendance-save-db:1:1,egov.employee:1:1,save-asset-db:1:1,update-asset-db:1:1,save-assetcategory-db:1:1,agreement-save-db:1:1,agreement-update-db:1:1,lams-workflow-start:1:1,lams-workflow-update:1:1,egov-common-holiday:1:1,egov.leaveopeningbalance-create:1:1,egov.leaveopeningbalance-update:1:1,egov-hr-leavetype:1:1,egov.leaveallotment-create:1:1,egov.leaveallotment-update:1:1,egov.designation-create:1:1,egov.designation-update:1:1,egov.position-create:1:1,egov.position-update:1:1,egov.egf.masters.validated.topic:1:1,egov.egf.masters.completed:1:1,egov.wcms.category-create:1:1,property-create-validated:1:1,property-create-tax-calculated:1:1,property-create-user-validated:1:1,property-create-workflow-started:1:1,property-create-workflow-updated:1:1,save-bill-db:1:1,update-bill-db:1:1,save-bill:1:1,update-bill:1:1,save-demand:1:1,update-demand:1:1,egov.collection.receipt-create:1:1,save-taxHeadMaster-db:1:1,update-taxHeadMaster:1:1,save-glCodeMaster-db:1:1,save-glCodeMaster:1:1,update-glCodeMaster-db:1:1,update-glCodeMaster:1:1,save-taxperiod-db:1:1,save-taxperiod:1:1,update-taxperiod-db:1:1,update-taxperiod:1:1,save-businessservicedetail-db:1:1,save-businessservicedetail:1:1,update-businessservicedetail-db:1:1,update-businessservicedetail:1:1,property-update-workflow-approved:1:1,property-update-user-validated:1:1,property-update-workflow-started:1:1,property-titletransfer-create-user-validated:1:1,property-titletransfer-update-user-validated:1:1,property-titletransfer-create-workflow-started:1:1,property-titletransfer-approved:1:1,property-titletransfer-workflow-updated:1:1,property-update-tax-calculated:1:1,property-update-validated:1:1,property-titletransfer-cretae-validated:1:1,property-titletransfer-update-validated:1:1,property-create-tax-generated:1:1,create-legacy-tradelicense-validated:1:1,egov.pgr.servicedefinition-create:1:1,demand-bill-update:1:1,egov.pgr.servicedefinition-update:1:1,egov-common-department-create:1:1,egov-common-department-update:1:1,egov.services.tl-services.create.legacy.tradelicense.validated:1:1,save-service-db:1:1,update-service-db:1:1,update-legacy-tradelicense-validated:1:1,tradelicense-validated:1:1,tradelicense-persisted:1:1,tradelicense-workflow-populated:1:1,demand-bill-update:1:1,egov.wcms.newconnection-create:1:1,egov.wcms.newconnection-update:1:1,update-newconn-workflow:1:1,initiated-newconn-workflow:1:1,works-offlinestatus-create-validated:1:1,works-offlinestatus-update-validated:1:1,works-contractor-create-validated:1:1,works-contractor-update-validated:1:1,works-letterofacceptance-create-validated:1:1,works-letterofacceptance-update-validated:1:1,works-measurementbook-create-update:1:1,works-revision-detailed-estimate-create-update:1:1,works-workorder-createupdate-validated:1:1,lcms-create-summon-validated:1:1,lcms-create-case:1:1,lcms-create-vakalatnama:1:1,lcms-parawisecomment-create:1:1,lcms-parawisecomment-update:1:1,lcms-assign-advocate:1:1,lcms-update-assign-advocate:1:1,lcms-advocate-create:1:1,lcms-advocate-update:1:1,advocate-payment-create:1:1,advocate-payment-update:1:1,lcms-opinion-create:1:1,lcms-opinion-update:1:1,legacy-case-create:1:1,legacy-hearing-create:1:1,legacy-case-voucher-create:1:1,legacy-case-advocate-create:1:1,lcms-hearingdetails-create:1:1,lcms-hearingdetails-update:1:1,lcms-notice-create:1:1,lcms-notice-update:1:1,lcms-register-create:1:1,lcms-register-update:1:1,lcms-evidence-create:1:1,lcms-evidence-update:1:1,lcms-agency-create:1:1,lcms-agency-update:1:1,lcms-personal-details-create:1:1,Lcms-event-create:1:1,lcms-create-summon-indexer:1:1,lcms-legacy-casecreate-indexer:1:1,works-abstract-estimate-createandupdate:1:1,works-detailed-estimate-createandupdate:1:1,works-revision-loa-create-update:1:1,works-sorrate-saveorupdate-validated:1:1,works-estimatetemplate-saveorupdate-validated:1:1,lcms-update-summon-validated:1:1,mdms.create.gitpushprocess:1:1,works-contractoradvance-saveorupdate-validated:1:1,works-qualitytesting-createandupdate:1:1,works-abstract-estimate-backupdate:1:1,works-detailedestimate-backupdate:1:1,works-abstract-estimate-backupdate-oncreate-detailedestimate:1:1,works-abstract-estimate-backupdate-oncancel-detailedestimate:1:1,works-detailedestimate-backupdate-oncreate-loa:1:1,works-detailedestimate-backupdate-oncancel-loa:1:1,swm-vehicleschedule-save-topic:1:1,works-projectcode-create:1:1,works-projectcode-update:1:1,works-masters-remarks-createandupdate:1:1,works-milestonetemplate-saveorupdate-validated:1:1,works-contractorbill-create-update:1:1,works-measurementbook-backupdate-for-billstatus:1:1,works-notice-createupdate-validated:1:1,works-milestone-saveorupdate-validated:1:1,works-trackmilestone-saveorupdate-validated:1:1,swm-shift-save-topic:1:1,swm-shift-update-topic:1:1,swm-shift-indexer-topic:1:1,works-letterofacceptance-backupdate-oncreate-workorder:1:1,works-letterofacceptance-backupdate-oncancel-workorder:1:1,works-loa-backupdate-oncreate-milestone:1:1,works-loa-backupdate-oncancel-milestone:1:1,works-loa-backupdate-oncreate-contractoradvance:1:1,works-loa-backupdate-oncancel-contractoradvance:1:1,works-loa-backupdate-onupdate-withallofflinestatusandworkorder:1:1,works-workorder-backupdate-oncreate-milestone:1:1,works-workorder-backupdate-oncancel-contractoradvance:1:1,works-loa-backupdate-onupdate-offlinestatus:1:1,works-workorder-backupdate-onupdate-offlinestatus:1:1,works-loa-backupdate-onupdate-withallofflinestatus:1:1,works-workorder-backupdate-onupdate-withallofflinestatus:1:1,works-loa-backupdate-oncreate-bill:1:1,works-loa-backupdate-oncancel-bill:1:1,works-loa-backupdate-oncreatemb:1:1,works-loa-backupdate-oncancelmb:1:1,works-loa-backupdate-oncreatembandnobill:1:1,works-loa-backupdate-oncreatembandbill:1:1,works-workorder-backupdate-oncreate-bill:1:1,works-workorder-backupdate-oncancel-bill:1:1,works-workorder-backupdate-oncreatembandnobill:1:1,works-workorder-backupdate-oncreatembandbill:1:1,egov.error:1:1,save-pt-property:1:1,update-pt-property:1:1,save-pt-billingslab:1:1,update-pt-billingslab:1:1,save-pg-txns:1:1,update-pg-txns:1:1,save-pg-txns-dump:1:1,update-pg-txns-dump:1:1,save-pt-drafts:1:1,update-pt-drafts:1:1,egov.collectionmasters.bankaccountservicemapping-create:1:1,bankaccountservicemapping-create:1:1,update-pt-property-index:1:1" + zookeeper-connect: "zookeeper-v2.kafka-kraft:2181" + kafka-brokers: "kafka-v2.kafka-cluster:9092" + +logging-config: + es-host: "elasticsearch-client-v1.es-cluster" + es-port: "9200" + +jaeger: + host: "jaeger-agent.monitoring" + port: "6831" + sampler-type: const + sampler-param: 1 + collector: + samplingConfig: | + { + "service_strategies": [ + { + "service": "tl-services", + "type": "probabilistic", + "param": 0.5 + }, + { + "service": "tl-calculator", + "type": "probabilistic", + "param": 0.5 + }, + { + "service": "report-service", + "type": "probabilistic", + "param": 0.5 + }, + { + "service": "pt-services-v2", + "type": "probabilistic", + "param": 0.5 + }, + { + "service": "pt-calculator-v2", + "type": "probabilistic", + "param": 0.5 + }, + { + "service": "collection-services", + "type": "probabilistic", + "param": 0.2 + }, + { + "service": "billing-service", + "type": "probabilistic", + "param": 0.2 + }, + { + "service": "egov-data-uploader", + "type": "probabilistic", + "param": 0.2 + }, + { + "service": "egov-hrms", + "type": "probabilistic", + "param": 0.5 + }, + { + "service": "rainmaker-pgr", + "type": "probabilistic", + "param": 0.5 + } + ], + "default_strategy": { + "type": "probabilistic", + "param": 0.05 + } + } + +# redis >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> +redis: + namespace: backbone + replicas: 1 + images: + - egovio/redis:3.2 +# <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< + +playground: + namespace: playground + replicas: 1 + images: + - egovio/playground:1.3 + +# fluent-bit >>>>>>>>>>>>>>>>>>>>>>>>>>>>> +fluent-bit: + images: + - fluent/fluent-bit:1.0.6 + egov-services-log-topic: "egov-services-logs" + egov-infra-log-topic: "egov-infra-logs" +# <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< + +# kafka-kraft AWS >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> +kafka-kraft: + controller: + persistence: + enabled: true + size: 25Gi + heapOpts: "-Xms1024M -Xmx1024M" + +### Kafka Connect <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< +kafka-connect: + replicas: 1 + image: + tag: "s3-7.5.2" + +# zookeeper-v2 AWS >>>>>>>>>>>>>>>>>>>>>>>>>>>>> +zookeeper-v2: + image: + tag: "5.4.1" + persistence: + enabled: true + # aws: + # - volumeId: "" ## REPLACE: add volume id + # zone: ap-south-1b ## REPLACE: add zone + # - volumeId: "" ## REPLACE: add volume id + # zone: ap-south-1b ## REPLACE: add zone + # - volumeId: "" ## REPLACE: add volume id + # zone: ap-south-1b ## REPLACE: add zone + + ## Zookeeper JVM Heap Option + heapOptions: "-Xms256M -Xmx256M" + resources: + limits: + cpu: 300m + memory: 384Mi + requests: + cpu: 300m + memory: 384Mi + + +# es-data AWS >>>>>>>>>>>>>>>>>>>>>>>>>>>> +elasticsearch-data: + image: + tag: 8.11.3 + persistence: + enabled: true + + esJavaOpts: "-Xmx2g -Xms2g" + resources: + requests: + cpu: "500m" + memory: "3Gi" + limits: + cpu: "2000m" + memory: "3Gi" + +### es-master AWS >>>>>>>>>>>>>>>>>>>> +elasticsearch-master: + replicas: 3 + image: + tag: 8.11.3 + persistence: + enabled: true + + esJavaOpts: "-Xmx1g -Xms1g" + resources: + requests: + cpu: "300m" + memory: "2Gi" + limits: + cpu: "500m" + memory: "2Gi" + +kibana: + image: + tag: 8.11.3 + +es-curator: + schedule: "45 18 * * *" + images: + - bobrik/curator:5.6.0 + es-host: "elasticsearch-data.es-cluster" + logs-cleanup-enabled: "true" + jaeger-cleanup-enabled: "true" + logs-to-retain: "7" +# <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< + +oauth2-proxy: + namespace: uat + contextUnique: true + config: + configFile: |- + email_domains = [ "*" ] + github_org = "ddws-org" + github_team = "naljal-uat" + upstreams = [ "file:///dev/null" ] + +grafana: + grafana.ini: + server: + root_url: "%(protocol)s://%(domain)s/uat/monitoring" + serve_from_sub_path: true + namespace: monitoring + dashboardsFolder: /work-dir/config-naljal/configs/monitoring-dashboards + initContainers: + gitSync: + enabled: true + repo: "git@github.com:ddws-org/config-naljal" + branch: "master" + +pgadmin: + replicas: 1 + dbUrl: "naljal-prod-db.c7a9hnasyeda.ap-south-1.rds.amazonaws.com" + dbReadUrl: "naljal-prod-db.c7a9hnasyeda.ap-south-1.rds.amazonaws.com" + environment: "NALJAL_PROD" + maintenance-db-name: "naljaluatdb" + db-admin-username: "uat_admin" + db-read-username: "uat_read_user" + cookie-protection: "False" + max-query-history: "50" + max-login-attempts: "5" + enable-save-password: "False" + persistence: + enabled: true + dataDirSize: "1Gi" From efcd56488ae889972dffbfca7a33a8a24d77f725 Mon Sep 17 00:00:00 2001 From: palak-egov Date: Wed, 20 Nov 2024 18:44:19 +0530 Subject: [PATCH 2/7] enabling penalty --- deploy-as-code/helm/environments/assam-prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy-as-code/helm/environments/assam-prod.yaml b/deploy-as-code/helm/environments/assam-prod.yaml index 89388b8eb..af5b1e514 100644 --- a/deploy-as-code/helm/environments/assam-prod.yaml +++ b/deploy-as-code/helm/environments/assam-prod.yaml @@ -417,7 +417,7 @@ ws-calculator: egov-url-shortener-endpoint: "/eus/shortener" penalty-applicable-in-days: 10 penalty-start-threshold-time: "1680285630000" - is-penalty-feature-enable: true + is-penalty-feature-enable: false is-save-demand-audit-enabled: true egov-save-demand-audit-from-wscal: "save-ws-demand-change-audit" From ad3227c9c929ba54e593120e02110317271e7777 Mon Sep 17 00:00:00 2001 From: palak-egov Date: Thu, 5 Dec 2024 15:26:48 +0530 Subject: [PATCH 3/7] pending devops changes --- .../business-services/egov-hrms/values.yaml | 2 ++ .../charts/core-services/mdms-v2/values.yaml | 1 - .../charts/utilities/api-cronjob/Chart.yaml | 26 +++++++++++++++++ .../api-cronjob/failedbulkdemand-values.yaml | 29 +++++++++++++++++++ .../api-cronjob/fortnightevening-values.yaml | 29 +++++++++++++++++++ .../utilities/api-cronjob/monthly-values.yaml | 29 +++++++++++++++++++ .../api-cronjob}/templates/cronjob.yaml | 0 .../charts/utilities/api-cronjob/values.yaml | 29 +++++++++++++++++++ .../egov-penalty-schedular/Chart.yaml | 0 .../templates/cronjob.yaml | 2 ++ .../egov-penalty-schedular/values.yaml | 8 ++--- .../helm/environments/assam-prod.yaml | 28 +++++++++++++++--- deploy-as-code/helm/environments/uat.yaml | 27 ++++++++++++++--- 13 files changed, 197 insertions(+), 13 deletions(-) create mode 100644 deploy-as-code/helm/charts/utilities/api-cronjob/Chart.yaml create mode 100644 deploy-as-code/helm/charts/utilities/api-cronjob/failedbulkdemand-values.yaml create mode 100644 deploy-as-code/helm/charts/utilities/api-cronjob/fortnightevening-values.yaml create mode 100644 deploy-as-code/helm/charts/utilities/api-cronjob/monthly-values.yaml rename deploy-as-code/helm/charts/{municipal-services/egov-penalty-schedular => utilities/api-cronjob}/templates/cronjob.yaml (100%) create mode 100644 deploy-as-code/helm/charts/utilities/api-cronjob/values.yaml rename deploy-as-code/helm/charts/{municipal-services => utilities}/egov-penalty-schedular/Chart.yaml (100%) create mode 100644 deploy-as-code/helm/charts/utilities/egov-penalty-schedular/templates/cronjob.yaml rename deploy-as-code/helm/charts/{municipal-services => utilities}/egov-penalty-schedular/values.yaml (92%) diff --git a/deploy-as-code/helm/charts/business-services/egov-hrms/values.yaml b/deploy-as-code/helm/charts/business-services/egov-hrms/values.yaml index 0eeeb1c9f..de133cbdc 100644 --- a/deploy-as-code/helm/charts/business-services/egov-hrms/values.yaml +++ b/deploy-as-code/helm/charts/business-services/egov-hrms/values.yaml @@ -8,6 +8,8 @@ ingress: enabled: true zuul: true context: "egov-hrms" + additionalAnnotations: | + nginx.ingress.kubernetes.io/proxy-body-size: "20m" # Init Containers Configs initContainers: 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 589ef84cb..07fe22187 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 @@ -6,7 +6,6 @@ labels: # Ingress Configs ingress: enabled: true - zuul: true context: "mdms-v2" initContainers: diff --git a/deploy-as-code/helm/charts/utilities/api-cronjob/Chart.yaml b/deploy-as-code/helm/charts/utilities/api-cronjob/Chart.yaml new file mode 100644 index 000000000..283f33f21 --- /dev/null +++ b/deploy-as-code/helm/charts/utilities/api-cronjob/Chart.yaml @@ -0,0 +1,26 @@ +apiVersion: v2 +name: api-cronjob +description: A Helm chart for Kubernetes + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: application + +# This is the chart version. This version number should be incremented each time you make changes +# to the chart and its templates, including the app version. +version: 0.1.0 + +# This is the version number of the application being deployed. This version number should be +# incremented each time you make changes to the application. +appVersion: 1.16.0 + +dependencies: +- name: common + version: 0.0.5 + repository: file://../../common \ No newline at end of file diff --git a/deploy-as-code/helm/charts/utilities/api-cronjob/failedbulkdemand-values.yaml b/deploy-as-code/helm/charts/utilities/api-cronjob/failedbulkdemand-values.yaml new file mode 100644 index 000000000..e84183288 --- /dev/null +++ b/deploy-as-code/helm/charts/utilities/api-cronjob/failedbulkdemand-values.yaml @@ -0,0 +1,29 @@ +# Common Labels +labels: + app: "failedbulkdemand-cronjob" + group: "mdms-read-cronjob" + +cron: + schedule: "30 3 5 * *" + +# Container Configs +image: + repository: "api-cronjob" + tag: "v1" + +command: + - "python3" + - "cronJobAPIConfig.py" +args: + - "failedbulkdemand" + +# Additional Container Envs +env: | + - name: JOB_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name +resources: | + requests: {} + + diff --git a/deploy-as-code/helm/charts/utilities/api-cronjob/fortnightevening-values.yaml b/deploy-as-code/helm/charts/utilities/api-cronjob/fortnightevening-values.yaml new file mode 100644 index 000000000..67448b41a --- /dev/null +++ b/deploy-as-code/helm/charts/utilities/api-cronjob/fortnightevening-values.yaml @@ -0,0 +1,29 @@ +# Common Labels +labels: + app: "fortnightevening-cronjob" + group: "mdms-read-cronjob" + +cron: + schedule: "30 12 1,15 * *" + +# Container Configs +image: + repository: "api-cronjob" + tag: "v1" + +command: + - "python3" + - "cronJobAPIConfig.py" +args: + - "fortnightevening" + +# Additional Container Envs +env: | + - name: JOB_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name +resources: | + requests: {} + + diff --git a/deploy-as-code/helm/charts/utilities/api-cronjob/monthly-values.yaml b/deploy-as-code/helm/charts/utilities/api-cronjob/monthly-values.yaml new file mode 100644 index 000000000..5063aa178 --- /dev/null +++ b/deploy-as-code/helm/charts/utilities/api-cronjob/monthly-values.yaml @@ -0,0 +1,29 @@ +# Common Labels +labels: + app: "monthly-cronjob" + group: "mdms-read-cronjob" + +cron: + schedule: "30 3 4 * *" + +# Container Configs +image: + repository: "api-cronjob" + tag: "v1" + +command: + - "python3" + - "cronJobAPIConfig.py" +args: + - "monthly" + +# Additional Container Envs +env: | + - name: JOB_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name +resources: | + requests: {} + + diff --git a/deploy-as-code/helm/charts/municipal-services/egov-penalty-schedular/templates/cronjob.yaml b/deploy-as-code/helm/charts/utilities/api-cronjob/templates/cronjob.yaml similarity index 100% rename from deploy-as-code/helm/charts/municipal-services/egov-penalty-schedular/templates/cronjob.yaml rename to deploy-as-code/helm/charts/utilities/api-cronjob/templates/cronjob.yaml diff --git a/deploy-as-code/helm/charts/utilities/api-cronjob/values.yaml b/deploy-as-code/helm/charts/utilities/api-cronjob/values.yaml new file mode 100644 index 000000000..57aa58af5 --- /dev/null +++ b/deploy-as-code/helm/charts/utilities/api-cronjob/values.yaml @@ -0,0 +1,29 @@ +# Common Labels +labels: + app: "mdms-read-cronjob" + group: "mdms-read-cronjob" + +cron: + schedule: "30 11 * * *" + +# Container Configs +image: + repository: "api-cronjob" + tag: "v1" + +command: + - "python3" + - "cronJobAPIConfig.py" +args: + - "dailyevening" + +# Additional Container Envs +env: | + - name: JOB_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name +resources: | + requests: {} + + diff --git a/deploy-as-code/helm/charts/municipal-services/egov-penalty-schedular/Chart.yaml b/deploy-as-code/helm/charts/utilities/egov-penalty-schedular/Chart.yaml similarity index 100% rename from deploy-as-code/helm/charts/municipal-services/egov-penalty-schedular/Chart.yaml rename to deploy-as-code/helm/charts/utilities/egov-penalty-schedular/Chart.yaml diff --git a/deploy-as-code/helm/charts/utilities/egov-penalty-schedular/templates/cronjob.yaml b/deploy-as-code/helm/charts/utilities/egov-penalty-schedular/templates/cronjob.yaml new file mode 100644 index 000000000..74d9de7ea --- /dev/null +++ b/deploy-as-code/helm/charts/utilities/egov-penalty-schedular/templates/cronjob.yaml @@ -0,0 +1,2 @@ +# cronjob.yaml +{{- template "common.cronjob" . -}} \ No newline at end of file diff --git a/deploy-as-code/helm/charts/municipal-services/egov-penalty-schedular/values.yaml b/deploy-as-code/helm/charts/utilities/egov-penalty-schedular/values.yaml similarity index 92% rename from deploy-as-code/helm/charts/municipal-services/egov-penalty-schedular/values.yaml rename to deploy-as-code/helm/charts/utilities/egov-penalty-schedular/values.yaml index c424af823..b13ec90fd 100644 --- a/deploy-as-code/helm/charts/municipal-services/egov-penalty-schedular/values.yaml +++ b/deploy-as-code/helm/charts/utilities/egov-penalty-schedular/values.yaml @@ -30,13 +30,13 @@ env: | key: ws-calculator - name: USER_SYSTEM_UUID valueFrom: - secretKeyRef: - name: egov-penalty-schedular + configMapKeyRef: + name: egov-config key: uuid - name: USER_SYSTEM_MOBILENUMBER valueFrom: - secretKeyRef: - name: egov-penalty-schedular + configMapKeyRef: + name: egov-config key: mobileNumber - name: USER_SYSTEM_ROLE value: {{ index .Values "user-system-role" | quote }} diff --git a/deploy-as-code/helm/environments/assam-prod.yaml b/deploy-as-code/helm/environments/assam-prod.yaml index af5b1e514..a11991b2a 100644 --- a/deploy-as-code/helm/environments/assam-prod.yaml +++ b/deploy-as-code/helm/environments/assam-prod.yaml @@ -175,6 +175,8 @@ cluster-configs: tracer-errors-provideexceptionindetails: "true" egov-bnd-freedownload-tenants: "pg.testing" egov-bnd-live-citizen-tenants: "pg.testing" + uuid: "bfb0438d-6918-4635-9806-c933ce4bb05d" + mobileNumber: "9098666007" egov-service-host: namespace: [ assam, monitoring, backbone ] @@ -247,6 +249,7 @@ frontend-mgramseva: ';" mgramseva-web: + react-app-public-path: "/assam/mgramseva-web/" custom-js-injection: | sub_filter.conf: " sub_filter '' ' @@ -259,6 +262,10 @@ workbench-ui: sub_filter '' ' ';" +egov-user-event: + memory_limits: 512Mi + heap: "-Xmx256m -Xms256m" + property-services: replicas: 2 memory_limits: 512Mi @@ -268,8 +275,8 @@ property-services: egov-url-shortener-endpoint: "/eus/shortener" boundary-service: - egov-mdms-search-endpoint: "/mdms-v2/v1/_search" - egov-mdms-create-endpoint: "/mdms-v2/v2/_create" + egov-mdms-search-endpoint: "mdms-v2/v1/_search" + egov-mdms-create-endpoint: "mdms-v2/v2/_create" mdms-v2: replicas: 2 @@ -567,7 +574,7 @@ gateway: server-tomcat-max-threads: "350" server-tomcat-max-connections: "1500" egov-open-endpoints-whitelist: "/assam/user/oauth/token,/assam/user-otp/v1/_send,/assam/otp/v1/_validate,/assam/user/citizen/_create,/assam/localization/messages,/assam/localization/messages/v1/_search,/assam/user/password/nologin/_update,/assam/pgr/servicedefinition/v1/_search,/assam/pgr/servicecategories/v1/_search,/assam/pgr/v1/otp/_send,/assam/pgr-master/receivingmode/v1/_search,/assam/tenant/v1/tenant/_search,/assam/egov-location/boundarys,/assam/egov-location/boundarys/boundariesByBndryTypeNameAndHierarchyTypeName,/assam/pgr-master/service/v1/_search,/assam/egov-location/boundarys/getLocationByLocationName,/assam/pgr-master/OTPConfig/_search,/assam/pgr-master/serviceGroup/v1/_search,/assam/egov-location/boundarys/isshapefileexist,/assam/pgr/services/v1/_search,/assam/hr-masters/hrconfigurations/_search,/assam/collection-services/receipts/_view,/assam/pgr-master/service/v2/_search,/assam/pgr-master/servicedefinition/v1/_search,/assam/citizen-services,/assam/citizen-services/v1/requests/receipt/_create,/assam/citizen-services/v1/pgresponse,/assam/citizen-services/v1/requests/anonymous/_search,/assam/egov-mdms-service/v1/_search,/assam/egov-mdms-service/v1/_get,/assam/egov-mdms-service/v1/_reload,/assam/egov-mdms-service/v1/_reloadobj,/assam/egov-location/boundarys/getshapefile,/assam/egov-indexer/index-operations/_index,/assam/egov-indexer/index-operations/_reload,/assam/egov-mdms-service-test/v1/_search,/assam/egov-mdms-create/v1/_update,/assam/egov-mdms-create/v1/_create,/assam/egov-mdms-service-test/v1/_reload,/assam/filestore/v1/files/url,/assam/eus,/assam/adapter-master-data/department/v1/_search,/assam/ifix-department-entity/departmentEntity/hierarchyLevel/v1/_search,/assam/ifix-department-entity/departmentEntity/v1/_search,/assam/adapter-master-data/project/v1/_create,/assam/adapter-master-data/project/v1/_search,/assam/egov-location/location/v11/boundarys/_search,/assam/mdms-v2/v1/_search,/assam/mdms-v2/schema/v1/_search,/assam/mdms-v2/v1/_get,/assam/filestore/v1/files,/assam/filestore/v1/inactive" - egov-mixed-mode-endpoints-whitelist: "/assam/pgr/seva/v1/_create,/assam/pgr/seva/v1/_search,/assam/pgr/seva/v1/_count,/assam/workflow/history/v1/_search,/assam/filestore/v1/files/id,/assam/filestore/v1/files/tag,/assam/egov-common-masters/departments/_search,/assam/pt-property/property/propertytypes/_search,/assam/pt-property/properties/_search,/assam/pt-property/property/usages/_search,/assam/egov-idgen/id/_generate,/assam/egf-masters/financialyears/_search,/assam/egov-common-workflows/process/_start,/assam/egov-common-workflows/process/_search,/assam/egov-common-workflows/tasks,/assam/egov-common-workflows/tasks/{id}/_update,/assam/user/_search,/assam/billing-service/demand/_dues,/assam/billing-service/bill/_generate,/assam/billing-service/demand/_create,/assam/wcms/masters/waterchargesconfig/_search,/assam/wcms/masters/usagetypes/_search,/assam/wcms/masters/pipesizes/_search,/assam/wcms-connection/connection/_getbillingtypes,/assam/wcms-connection/connection/_getconnectiontypes,/assam/wcms/masters/sourcetypes/_search,/assam/wcms/masters/supplytypes/_search,/assam/wcms/masters/storagereservoirs/_search,/assam/wcms/masters/treatmentplants/_search,/assam/wcms/masters/documenttypes-applicationtypes/_search,/assam/wcms/masters/donations/_search,/assam/wcms/masters/nonmeterwaterrates/_search,/assam/wcms-connection/connection/_create,/assam/egov-common-masters/genders/_search,/assam/egov-common-workflows/designations/_search,/assam/access/v1/actions/mdms/_get,/assam/tl-services/v1/BPAREG/_create,/assam/tl-services/v1/BPAREG/_update,/assam/tl-calculator/v1/BPAREG/_getbill,/assam/property-services/property/_search,/assam/billing-service/bill/v2/_search,/assam/pg-service/transaction/v1/_create,/assam/collection-services/payments/_search,/assam/pdf-service/v1/_create,/assam/billing-service/bill/v2/_fetchbill,/assam/pg-service/transaction/v1/_update,/assam/ws-services/wc/_bulkonboard,/assam/ws-services/wc/_submitfeedback,/assam/ws-services/wc/_search,/assam/collection-services/payments/WS/_search,/assam/ws-calculator/waterCalculator/_getPenaltyDetails,/assam/billing-service/demand/_search,/assam/collection-services/payments/_create,/assam/pg-service/transaction/v1/_redirect,/assam/adapter-master-data/project/v1/_search" + egov-mixed-mode-endpoints-whitelist: "/assam/pgr/seva/v1/_create,/assam/pgr/seva/v1/_search,/assam/pgr/seva/v1/_count,/assam/workflow/history/v1/_search,/assam/filestore/v1/files/id,/assam/filestore/v1/files/tag,/assam/egov-common-masters/departments/_search,/assam/pt-property/property/propertytypes/_search,/assam/pt-property/properties/_search,/assam/pt-property/property/usages/_search,/assam/egov-idgen/id/_generate,/assam/egf-masters/financialyears/_search,/assam/egov-common-workflows/process/_start,/assam/egov-common-workflows/process/_search,/assam/egov-common-workflows/tasks,/assam/egov-common-workflows/tasks/{id}/_update,/assam/user/_search,/assam/billing-service/demand/_dues,/assam/billing-service/bill/_generate,/assam/billing-service/demand/_create,/assam/wcms/masters/waterchargesconfig/_search,/assam/wcms/masters/usagetypes/_search,/assam/wcms/masters/pipesizes/_search,/assam/wcms-connection/connection/_getbillingtypes,/assam/wcms-connection/connection/_getconnectiontypes,/assam/wcms/masters/sourcetypes/_search,/assam/wcms/masters/supplytypes/_search,/assam/wcms/masters/storagereservoirs/_search,/assam/wcms/masters/treatmentplants/_search,/assam/wcms/masters/documenttypes-applicationtypes/_search,/assam/wcms/masters/donations/_search,/assam/wcms/masters/nonmeterwaterrates/_search,/assam/wcms-connection/connection/_create,/assam/egov-common-masters/genders/_search,/assam/egov-common-workflows/designations/_search,/assam/access/v1/actions/mdms/_get,/assam/tl-services/v1/BPAREG/_create,/assam/tl-services/v1/BPAREG/_update,/assam/tl-calculator/v1/BPAREG/_getbill,/assam/property-services/property/_search,/assam/billing-service/bill/v2/_search,/assam/pg-service/transaction/v1/_create,/assam/collection-services/payments/_search,/assam/pdf-service/v1/_create,/assam/billing-service/bill/v2/_fetchbill,/assam/pg-service/transaction/v1/_update,/assam/ws-services/wc/_bulkonboard,/assam/ws-services/wc/_submitfeedback,/assam/ws-services/wc/_search,/assam/collection-services/payments/WS/_search,/assam/ws-calculator/waterCalculator/_getPenaltyDetails,/assam/billing-service/demand/_search,/assam/collection-services/payments/_create,/assam/pg-service/transaction/v1/_redirect,/assam/adapter-master-data/project/v1/_search,/assam/pg-service/transaction/v1/_search" # <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< @@ -625,7 +632,7 @@ egov-workflow-v2: egov-hrms: replicas: 2 java-args: -Dspring.profiles.active=monitoring - employee-applink: "https://egov-demo.egovernments.org/employee/user/login" + employee-applink: "https://naljalseva.jjm.gov.in/assam/mgramseva/login" memory_limits: 512Mi heap: "-Xmx400m -Xms400m" sms-user-creation-enabled: true @@ -821,3 +828,16 @@ grafana: github: allowed_organizations: ["ddws-org"] role_attribute_path: contains(groups[*], '@ddws-org/assam') && 'Viewer' + +egov-penalty-schedular: + java-enable-debug: "true" + egov-mdms-host: "http://localhost:8094" + egov-mdms-search-endpoint: "/assam/mdms-v2/v1/_search" + mdms-event-tenantId: "as" + egov-wscalculator-host: "http://localhost:8083" + egov-wscalculator-url: "/assam/ws-calculator/waterCalculator/_addPenalty" + egov-penalty-enabled: "true" + egov-penalty-enabled-block-code-list: "DIV1038" + user-system-role: "EMPLOYEE" + cron: + schedule: "*/60 * * * *" diff --git a/deploy-as-code/helm/environments/uat.yaml b/deploy-as-code/helm/environments/uat.yaml index d1ffd2a22..121c94dbe 100644 --- a/deploy-as-code/helm/environments/uat.yaml +++ b/deploy-as-code/helm/environments/uat.yaml @@ -166,6 +166,8 @@ cluster-configs: tracer-errors-provideexceptionindetails: "true" egov-bnd-freedownload-tenants: "pg.testing" egov-bnd-live-citizen-tenants: "pg.testing" + uuid: "bfb0438d-6918-4635-9806-c933ce4bb05d" + mobileNumber: "9098666007" egov-service-host: namespace: [ uat, monitoring ] @@ -307,6 +309,7 @@ frontend-mgramseva: sub_filter.conf: "sub_filter '' '';" mgramseva-web: + react-app-public-path: "/uat/mgramseva-web/" custom-js-injection: | sub_filter.conf: " sub_filter '' ' @@ -320,6 +323,9 @@ workbench-ui: sub_filter '' ' ';" +egov-user-event: + memory_limits: 512Mi + heap: "-Xmx256m -Xms256m" property-services: replicas: 10 @@ -330,8 +336,8 @@ property-services: egov-url-shortener-endpoint: "/eus/shortener" boundary-service: - egov-mdms-search-endpoint: "/mdms-v2/v1/_search" - egov-mdms-create-endpoint: "/mdms-v2/v2/_create" + egov-mdms-search-endpoint: "mdms-v2/v1/_search" + egov-mdms-create-endpoint: "mdms-v2/v2/_create" mdms-v2: replicas: 10 @@ -659,7 +665,7 @@ gateway: server-tomcat-max-threads: "350" server-tomcat-max-connections: "1500" egov-open-endpoints-whitelist: "/uat/egov-user-event/v1/events/_search,/uat/user/oauth/token,/uat/user-otp/v1/_send,/uat/otp/v1/_validate,/uat/user/citizen/_create,/uat/localization/messages,/uat/localization/messages/v1/_search,/uat/user/password/nologin/_update,/uat/pgr/servicedefinition/v1/_search,/uat/pgr/servicecategories/v1/_search,/uat/pgr/v1/otp/_send,/uat/pgr-master/receivingmode/v1/_search,/uat/tenant/v1/tenant/_search,/uat/egov-location/boundarys,/uat/egov-location/boundarys/boundariesByBndryTypeNameAndHierarchyTypeName,/uat/pgr-master/service/v1/_search,/uat/egov-location/boundarys/getLocationByLocationName,/uat/pgr-master/OTPConfig/_search,/uat/pgr-master/serviceGroup/v1/_search,/uat/egov-location/boundarys/isshapefileexist,/uat/pgr/services/v1/_search,/uat/hr-masters/hrconfigurations/_search,/uat/collection-services/receipts/_view,/uat/pgr-master/service/v2/_search,/uat/pgr-master/servicedefinition/v1/_search,/uat/citizen-services,/uat/citizen-services/v1/requests/receipt/_create,/uat/citizen-services/v1/pgresponse,/uat/citizen-services/v1/requests/anonymous/_search,/uat/egov-mdms-service/v1/_search,/uat/egov-mdms-service/v1/_get,/uat/egov-mdms-service/v1/_reload,/uat/egov-mdms-service/v1/_reloadobj,/uat/egov-location/boundarys/getshapefile,/uat/egov-indexer/index-operations/_index,/uat/egov-indexer/index-operations/_reload,/uat/egov-mdms-service-test/v1/_search,/uat/egov-mdms-create/v1/_update,/uat/egov-mdms-create/v1/_create,/uat/egov-mdms-service-test/v1/_reload,/uat/filestore/v1/files/url,/uat/eus,/uat/adapter-master-data/department/v1/_search,/uat/ifix-department-entity/departmentEntity/hierarchyLevel/v1/_search,/uat/ifix-department-entity/departmentEntity/v1/_search,/uat/adapter-master-data/project/v1/_create,/uat/adapter-master-data/project/v1/_search,/uat/egov-location/location/v11/boundarys/_search,/uat/mdms-v2/v1/_search,/uat/mdms-v2/schema/v1/_search,/uat/mdms-v2/v1/_get,/uat/filestore/v1/files" - egov-mixed-mode-endpoints-whitelist: "/uat/egov-user-event/v1/events/_search,/uat/pgr/seva/v1/_create,/uat/pgr/seva/v1/_search,/uat/pgr/seva/v1/_count,/uat/workflow/history/v1/_search,/uat/filestore/v1/files/id,/uat/filestore/v1/files/tag,/uat/egov-common-masters/departments/_search,/uat/pt-property/property/propertytypes/_search,/uat/pt-property/properties/_search,/uat/pt-property/property/usages/_search,/uat/egov-idgen/id/_generate,/uat/egf-masters/financialyears/_search,/uat/egov-common-workflows/process/_start,/uat/egov-common-workflows/process/_search,/uat/egov-common-workflows/tasks,/uat/egov-common-workflows/tasks/{id}/_update,/uat/user/_search,/uat/billing-service/demand/_dues,/uat/billing-service/bill/_generate,/uat/billing-service/demand/_create,/uat/wcms/masters/waterchargesconfig/_search,/uat/wcms/masters/usagetypes/_search,/uat/wcms/masters/pipesizes/_search,/uat/wcms-connection/connection/_getbillingtypes,/uat/wcms-connection/connection/_getconnectiontypes,/uat/wcms/masters/sourcetypes/_search,/uat/wcms/masters/supplytypes/_search,/uat/wcms/masters/storagereservoirs/_search,/uat/wcms/masters/treatmentplants/_search,/uat/wcms/masters/documenttypes-applicationtypes/_search,/uat/wcms/masters/donations/_search,/uat/wcms/masters/nonmeterwaterrates/_search,/uat/wcms-connection/connection/_create,/uat/egov-common-masters/genders/_search,/uat/egov-common-workflows/designations/_search,/uat/access/v1/actions/mdms/_get,/uat/tl-services/v1/BPAREG/_create,/uat/tl-services/v1/BPAREG/_update,/uat/tl-calculator/v1/BPAREG/_getbill,/uat/property-services/property/_search,/uat/billing-service/bill/v2/_search,/uat/pg-service/transaction/v1/_create,/uat/collection-services/payments/_search,/uat/pdf-service/v1/_create,/uat/billing-service/bill/v2/_fetchbill,/uat/pg-service/transaction/v1/_update,/uat/ws-services/wc/_bulkonboard,/uat/ws-services/wc/_submitfeedback,/uat/ws-services/wc/_search,/uat/collection-services/payments/WS/_search,/uat/ws-calculator/waterCalculator/_getPenaltyDetails,/uat/billing-service/demand/_search,/uat/collection-services/payments/_create,/uat/pg-service/transaction/v1/_redirect,/uat/adapter-master-data/project/v1/_search,/uat/billing-service/demand/_getAggregateDemandDetails,/uat/egov-hrms/employees/_searchListOfEmployee" + egov-mixed-mode-endpoints-whitelist: "/uat/egov-user-event/v1/events/_search,/uat/pgr/seva/v1/_create,/uat/pgr/seva/v1/_search,/uat/pgr/seva/v1/_count,/uat/workflow/history/v1/_search,/uat/filestore/v1/files/id,/uat/filestore/v1/files/tag,/uat/egov-common-masters/departments/_search,/uat/pt-property/property/propertytypes/_search,/uat/pt-property/properties/_search,/uat/pt-property/property/usages/_search,/uat/egov-idgen/id/_generate,/uat/egf-masters/financialyears/_search,/uat/egov-common-workflows/process/_start,/uat/egov-common-workflows/process/_search,/uat/egov-common-workflows/tasks,/uat/egov-common-workflows/tasks/{id}/_update,/uat/user/_search,/uat/billing-service/demand/_dues,/uat/billing-service/bill/_generate,/uat/billing-service/demand/_create,/uat/wcms/masters/waterchargesconfig/_search,/uat/wcms/masters/usagetypes/_search,/uat/wcms/masters/pipesizes/_search,/uat/wcms-connection/connection/_getbillingtypes,/uat/wcms-connection/connection/_getconnectiontypes,/uat/wcms/masters/sourcetypes/_search,/uat/wcms/masters/supplytypes/_search,/uat/wcms/masters/storagereservoirs/_search,/uat/wcms/masters/treatmentplants/_search,/uat/wcms/masters/documenttypes-applicationtypes/_search,/uat/wcms/masters/donations/_search,/uat/wcms/masters/nonmeterwaterrates/_search,/uat/wcms-connection/connection/_create,/uat/egov-common-masters/genders/_search,/uat/egov-common-workflows/designations/_search,/uat/access/v1/actions/mdms/_get,/uat/tl-services/v1/BPAREG/_create,/uat/tl-services/v1/BPAREG/_update,/uat/tl-calculator/v1/BPAREG/_getbill,/uat/property-services/property/_search,/uat/billing-service/bill/v2/_search,/uat/pg-service/transaction/v1/_create,/uat/collection-services/payments/_search,/uat/pdf-service/v1/_create,/uat/billing-service/bill/v2/_fetchbill,/uat/pg-service/transaction/v1/_update,/uat/ws-services/wc/_bulkonboard,/uat/ws-services/wc/_submitfeedback,/uat/ws-services/wc/_search,/uat/collection-services/payments/WS/_search,/uat/ws-calculator/waterCalculator/_getPenaltyDetails,/uat/billing-service/demand/_search,/uat/collection-services/payments/_create,/uat/pg-service/transaction/v1/_redirect,/uat/adapter-master-data/project/v1/_search,/uat/billing-service/demand/_getAggregateDemandDetails,/uat/egov-hrms/employees/_searchListOfEmployee,/uat/pg-service/transaction/v1/_search" zuul: contextUnique: true @@ -738,7 +744,7 @@ egov-workflow-v2: egov-hrms: java-args: -Dspring.profiles.active=monitoring memory_limits: "512Mi" - employee-applink: "https://egov-demo.egovernments.org/employee/user/login" + employee-applink: "https://naljalseva.jjm.gov.in/uat/mgramseva/login" sms-user-creation-enabled: true egov-mdms-search-endpoint: "/mdms-v2/v1/_search" @@ -967,3 +973,16 @@ pgadmin: persistence: enabled: true dataDirSize: "1Gi" + +egov-penalty-schedular: + java-enable-debug: "true" + egov-mdms-host: "http://localhost:8094" + egov-mdms-search-endpoint: "/uat/mdms-v2/v1/_search" + mdms-event-tenantId: "as" + egov-wscalculator-host: "http://localhost:8083" + egov-wscalculator-url: "/uat/ws-calculator/waterCalculator/_addPenalty" + egov-penalty-enabled: "true" + egov-penalty-enabled-block-code-list: "1189" + user-system-role: "EMPLOYEE" + cron: + schedule: "*/30 * * * *" From c7bef96cab0a85418e04c6489e7eaa0cafb0ea48 Mon Sep 17 00:00:00 2001 From: palak-egov Date: Fri, 6 Dec 2024 14:39:46 +0530 Subject: [PATCH 4/7] correct url for penalty --- .../business-services/collection-services/values.yaml | 7 ------- deploy-as-code/helm/environments/assam-prod.yaml | 4 ++-- deploy-as-code/helm/environments/uat.yaml | 4 ++-- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/deploy-as-code/helm/charts/business-services/collection-services/values.yaml b/deploy-as-code/helm/charts/business-services/collection-services/values.yaml index cdc441852..e1d67647a 100644 --- a/deploy-as-code/helm/charts/business-services/collection-services/values.yaml +++ b/deploy-as-code/helm/charts/business-services/collection-services/values.yaml @@ -134,13 +134,6 @@ env: | value: "false" - name: MANAGEMENT_SECURITY_ENABLED value: "false" - - name: EGOV_MDMS_HOST - valueFrom: - configMapKeyRef: - name: egov-service-host - key: egov-mdms-service - - name: EGOV_MDMS_SEARCH_ENDPOINT - value: {{ index .Values "egov-mdms-search-endpoint" | quote }} - name: EGOV_LOCALIZATION_HOST valueFrom: configMapKeyRef: diff --git a/deploy-as-code/helm/environments/assam-prod.yaml b/deploy-as-code/helm/environments/assam-prod.yaml index a11991b2a..86ddbc483 100644 --- a/deploy-as-code/helm/environments/assam-prod.yaml +++ b/deploy-as-code/helm/environments/assam-prod.yaml @@ -832,10 +832,10 @@ grafana: egov-penalty-schedular: java-enable-debug: "true" egov-mdms-host: "http://localhost:8094" - egov-mdms-search-endpoint: "/assam/mdms-v2/v1/_search" + egov-mdms-search-endpoint: "/mdms-v2/v1/_search" mdms-event-tenantId: "as" egov-wscalculator-host: "http://localhost:8083" - egov-wscalculator-url: "/assam/ws-calculator/waterCalculator/_addPenalty" + egov-wscalculator-url: "/ws-calculator/waterCalculator/_addPenalty" egov-penalty-enabled: "true" egov-penalty-enabled-block-code-list: "DIV1038" user-system-role: "EMPLOYEE" diff --git a/deploy-as-code/helm/environments/uat.yaml b/deploy-as-code/helm/environments/uat.yaml index 121c94dbe..5be0aa075 100644 --- a/deploy-as-code/helm/environments/uat.yaml +++ b/deploy-as-code/helm/environments/uat.yaml @@ -977,10 +977,10 @@ pgadmin: egov-penalty-schedular: java-enable-debug: "true" egov-mdms-host: "http://localhost:8094" - egov-mdms-search-endpoint: "/uat/mdms-v2/v1/_search" + egov-mdms-search-endpoint: "/mdms-v2/v1/_search" mdms-event-tenantId: "as" egov-wscalculator-host: "http://localhost:8083" - egov-wscalculator-url: "/uat/ws-calculator/waterCalculator/_addPenalty" + egov-wscalculator-url: "/ws-calculator/waterCalculator/_addPenalty" egov-penalty-enabled: "true" egov-penalty-enabled-block-code-list: "1189" user-system-role: "EMPLOYEE" From e0c72dfa888f0003bb97fd9a75ba9d81134aae66 Mon Sep 17 00:00:00 2001 From: palak-egov Date: Fri, 6 Dec 2024 17:24:42 +0530 Subject: [PATCH 5/7] moving mobile and uuid to secrets --- .../charts/utilities/egov-penalty-schedular/values.yaml | 8 ++++---- deploy-as-code/helm/environments/assam-prod.yaml | 2 -- deploy-as-code/helm/environments/uat.yaml | 2 -- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/deploy-as-code/helm/charts/utilities/egov-penalty-schedular/values.yaml b/deploy-as-code/helm/charts/utilities/egov-penalty-schedular/values.yaml index b13ec90fd..c424af823 100644 --- a/deploy-as-code/helm/charts/utilities/egov-penalty-schedular/values.yaml +++ b/deploy-as-code/helm/charts/utilities/egov-penalty-schedular/values.yaml @@ -30,13 +30,13 @@ env: | key: ws-calculator - name: USER_SYSTEM_UUID valueFrom: - configMapKeyRef: - name: egov-config + secretKeyRef: + name: egov-penalty-schedular key: uuid - name: USER_SYSTEM_MOBILENUMBER valueFrom: - configMapKeyRef: - name: egov-config + secretKeyRef: + name: egov-penalty-schedular key: mobileNumber - name: USER_SYSTEM_ROLE value: {{ index .Values "user-system-role" | quote }} diff --git a/deploy-as-code/helm/environments/assam-prod.yaml b/deploy-as-code/helm/environments/assam-prod.yaml index 86ddbc483..4aa0e6948 100644 --- a/deploy-as-code/helm/environments/assam-prod.yaml +++ b/deploy-as-code/helm/environments/assam-prod.yaml @@ -175,8 +175,6 @@ cluster-configs: tracer-errors-provideexceptionindetails: "true" egov-bnd-freedownload-tenants: "pg.testing" egov-bnd-live-citizen-tenants: "pg.testing" - uuid: "bfb0438d-6918-4635-9806-c933ce4bb05d" - mobileNumber: "9098666007" egov-service-host: namespace: [ assam, monitoring, backbone ] diff --git a/deploy-as-code/helm/environments/uat.yaml b/deploy-as-code/helm/environments/uat.yaml index 5be0aa075..e8da3c231 100644 --- a/deploy-as-code/helm/environments/uat.yaml +++ b/deploy-as-code/helm/environments/uat.yaml @@ -166,8 +166,6 @@ cluster-configs: tracer-errors-provideexceptionindetails: "true" egov-bnd-freedownload-tenants: "pg.testing" egov-bnd-live-citizen-tenants: "pg.testing" - uuid: "bfb0438d-6918-4635-9806-c933ce4bb05d" - mobileNumber: "9098666007" egov-service-host: namespace: [ uat, monitoring ] From 4afca7bf5998749ddca53fc6343537b15a95b665 Mon Sep 17 00:00:00 2001 From: debasishchakraborty-egovt Date: Sun, 29 Dec 2024 18:21:03 +0530 Subject: [PATCH 6/7] Added changes in devops for 2.7 release --- .../collection-services/values.yaml | 7 +++ .../boundary-service/values.yaml | 15 ++++++- .../core-services/egov-filestore/values.yaml | 2 +- .../egov-url-shortening/values.yaml | 2 - .../charts/frontend/mgramseva-web/values.yaml | 14 ++++++ .../echallan-services/values.yaml | 6 ++- .../utilities/boundary-bulk-bff/values.yaml | 7 +++ .../helm/environments/assam-prod.yaml | 44 ++++++++++++------- 8 files changed, 74 insertions(+), 23 deletions(-) diff --git a/deploy-as-code/helm/charts/business-services/collection-services/values.yaml b/deploy-as-code/helm/charts/business-services/collection-services/values.yaml index e1d67647a..cdc441852 100644 --- a/deploy-as-code/helm/charts/business-services/collection-services/values.yaml +++ b/deploy-as-code/helm/charts/business-services/collection-services/values.yaml @@ -134,6 +134,13 @@ env: | value: "false" - name: MANAGEMENT_SECURITY_ENABLED value: "false" + - name: EGOV_MDMS_HOST + valueFrom: + configMapKeyRef: + name: egov-service-host + key: egov-mdms-service + - name: EGOV_MDMS_SEARCH_ENDPOINT + value: {{ index .Values "egov-mdms-search-endpoint" | quote }} - name: EGOV_LOCALIZATION_HOST valueFrom: configMapKeyRef: diff --git a/deploy-as-code/helm/charts/core-services/boundary-service/values.yaml b/deploy-as-code/helm/charts/core-services/boundary-service/values.yaml index ae8f2adb0..fcb23ed15 100644 --- a/deploy-as-code/helm/charts/core-services/boundary-service/values.yaml +++ b/deploy-as-code/helm/charts/core-services/boundary-service/values.yaml @@ -38,8 +38,17 @@ kafka-topics-update-boundary-relationship: "update-boundary-relationship" # Additional Container Envs env: | - - name: SERVER_CONTEXT_PATH - value: /boundary-service + {{- if and (.Values.global.context.path) (has .Values.name .Values.global.context.list) }} + - name: SERVER_CONTEXTPATH + value: /{{ .Values.global.context.path }}/{{ .Values.ingress.context }} + - name: SERVER_SERVLET_CONTEXT_PATH + value: /{{ .Values.global.context.path }}/{{ .Values.ingress.context }} + {{- else }} + - name: SERVER_CONTEXTPATH + value: /{{ .Values.ingress.context }} + - name: SERVER_SERVLET_CONTEXT_PATH + value: /{{ .Values.ingress.context }} + {{- end }} - name: SPRING_KAFKA_CONSUMER_GROUP_ID value: boundary-service - name: SPRING_KAFKA_PRODUCER_KEY_SERIALIZER @@ -81,6 +90,8 @@ env: | value: {{ index .Values "egov-mdms-search-endpoint" | quote }} - name: EGOV_MDMS_CREATE_ENDPOINT value: {{ index .Values "egov-mdms-create-endpoint" | quote }} + - name: BOUNDARY_SERVICE_URI + value: {{ index .Values "egov-boundary-relationship-search-endpoint" | quote }} - name: EGOV_LOCALIZATION_HOST valueFrom: configMapKeyRef: diff --git a/deploy-as-code/helm/charts/core-services/egov-filestore/values.yaml b/deploy-as-code/helm/charts/core-services/egov-filestore/values.yaml index b2754d1de..6f3da0d38 100644 --- a/deploy-as-code/helm/charts/core-services/egov-filestore/values.yaml +++ b/deploy-as-code/helm/charts/core-services/egov-filestore/values.yaml @@ -30,7 +30,7 @@ tracing-enabled: true is-bucket-fixed: "true" fixed-bucketname: "egov-rainmaker" heap: "-Xmx384m -Xms256m" -file-storage-mount-path: "/filestore" +file-storage-mount-path: "/assam/filestore" is-nfs-enabled: false is-s3-enabled: true diff --git a/deploy-as-code/helm/charts/core-services/egov-url-shortening/values.yaml b/deploy-as-code/helm/charts/core-services/egov-url-shortening/values.yaml index 04b773946..7862889eb 100644 --- a/deploy-as-code/helm/charts/core-services/egov-url-shortening/values.yaml +++ b/deploy-as-code/helm/charts/core-services/egov-url-shortening/values.yaml @@ -42,8 +42,6 @@ env: | - name: SERVER_SERVLET_CONTEXT_PATH value: /{{ .Values.global.context.path }}/{{ .Values.ingress.context }} {{- else }} - - name: SERVER_CONTEXT_PATH - value: /{{ .Values.ingress.context }} - name: SERVER_CONTEXT_PATH value: /{{ .Values.ingress.context }} - name: SERVER_SERVLET_CONTEXT_PATH diff --git a/deploy-as-code/helm/charts/frontend/mgramseva-web/values.yaml b/deploy-as-code/helm/charts/frontend/mgramseva-web/values.yaml index 6541d9c8d..065c1e674 100644 --- a/deploy-as-code/helm/charts/frontend/mgramseva-web/values.yaml +++ b/deploy-as-code/helm/charts/frontend/mgramseva-web/values.yaml @@ -31,3 +31,17 @@ extraVolumeMounts: | - mountPath: /etc/nginx/conf.d/sub_filter.conf name: js-injection subPath: sub_filter.conf + +# Additional Container Envs +env: | + {{- if index .Values "react-app-public-path" }} + - name: REACT_APP_PUBLIC_PATH + value: {{ index .Values "react-app-public-path" | quote }} + {{- end }} + + + + + + + diff --git a/deploy-as-code/helm/charts/municipal-services/echallan-services/values.yaml b/deploy-as-code/helm/charts/municipal-services/echallan-services/values.yaml index 4e60a6e57..01c2686ef 100644 --- a/deploy-as-code/helm/charts/municipal-services/echallan-services/values.yaml +++ b/deploy-as-code/helm/charts/municipal-services/echallan-services/values.yaml @@ -155,10 +155,14 @@ env: | value: {{ index .Values "heap" | quote }} - name: JAVA_ARGS value: {{ index .Values "java-args" | quote }} + - name: EGOV_URL_SHORTNER_ENDPOINT + value: {{ index .Values "egov-url-shortener-endpoint" | quote }} - name: SERVER_PORT value: "8080" - name: EGOV_IDGEN_CHALLANNUM_FORMAT value: {{ index .Values "egov-idgen-challanNum-format" | quote }} + - name: EGOV_URL_SHORTNER_ENDPOINT + value: {{ index .Values "egov-url-shortener-endpoint" | quote }} - name: SECURITY_BASIC_ENABLED value: "false" - name: MANAGEMENT_SECURITY_ENABLED @@ -171,5 +175,3 @@ env: | - name: JAVA_ENABLE_DEBUG value: "true" {{- end }} - - name: EGOV_URL_SHORTNER_ENDPOINT - value: {{ index .Values "egov-url-shortener-endpoint" | quote }} diff --git a/deploy-as-code/helm/charts/utilities/boundary-bulk-bff/values.yaml b/deploy-as-code/helm/charts/utilities/boundary-bulk-bff/values.yaml index 46d3ed912..04580956a 100644 --- a/deploy-as-code/helm/charts/utilities/boundary-bulk-bff/values.yaml +++ b/deploy-as-code/helm/charts/utilities/boundary-bulk-bff/values.yaml @@ -29,6 +29,13 @@ replicas: "1" # Additional Container Envs env: | + {{- if and (.Values.global.context.path) (has .Values.name .Values.global.context.list) }} + - name: CONTEXT_PATH + value: /{{ .Values.global.context.path }}/{{ .Values.ingress.context }} + {{- else }} + - name: CONTEXT_PATH + value: /{{ .Values.ingress.context }} + {{- end }} - name: KAFKA_BROKER_HOST valueFrom: configMapKeyRef: diff --git a/deploy-as-code/helm/environments/assam-prod.yaml b/deploy-as-code/helm/environments/assam-prod.yaml index 4aa0e6948..5dcd995cb 100644 --- a/deploy-as-code/helm/environments/assam-prod.yaml +++ b/deploy-as-code/helm/environments/assam-prod.yaml @@ -38,6 +38,8 @@ global: - egov-accesscontrol - workbench-ui - mdms-v2 + - boundary-service + - boundary-bulk-bff cluster-configs: @@ -228,6 +230,9 @@ cluster-configs: mdms-v2: "http://mdms-v2:8080/assam/" vehicle: "http://vehicle.assam:8080" egov-common-masters: "http://egov-common-masters:8080/" + boundary-bulk-bff: "http://boundary-bulk-bff.uat:8080/assam/" + boundary-service: "http://boundary-service.uat:8080/assam/" + digit-ui: custom-js-injection: | @@ -266,26 +271,27 @@ egov-user-event: property-services: replicas: 2 - memory_limits: 512Mi - heap: "-Xmx512m -Xms512m" + memory_limits: 1024Mi + heap: "-Xmx768m -Xms768m" egov-mdms-search-endpoint: "/mdms-v2/v1/_search" egov-shortener-url: "eus/shortener" egov-url-shortener-endpoint: "/eus/shortener" boundary-service: - egov-mdms-search-endpoint: "mdms-v2/v1/_search" - egov-mdms-create-endpoint: "mdms-v2/v2/_create" + egov-mdms-search-endpoint: "mdms-v2/v1/_search" + egov-mdms-create-endpoint: "mdms-v2/v2/_create" + egov-boundary-relationship-search-endpoint: "/uat/boundary-service/boundary-relationships/_search" mdms-v2: - replicas: 2 - memory_limits: 512Mi - heap: "-Xmx512m -Xms512m" + replicas: 3 + memory_limits: 1024Mi + heap: "-Xmx768m -Xms768m" egov-url-shortening: replicas: 2 egov-filestore: - memory_limits: 512Mi + memory_limits: 768Mi heap: "-Xmx512m -Xms512m" volume: /opt/eGov/filestore is-bucket-fixed: "true" @@ -361,7 +367,8 @@ egov-user: billing-service: replicas: 2 - memory_limits: 512Mi + heap: "-Xmx1248m -Xms1248m" + memory_limits: "1468Mi" demand.updateurl: '{"WS":"http://ws-calculator.assam:8080/assam/ws-calculator/waterCalculator/_updateDemand"}' sms-bill-notification-enable: false egov-mdms-search-endpoint: "/mdms-v2/v1/_search" @@ -369,9 +376,9 @@ billing-service: ws-services: wcid-format: "WS/[CITY.CODE]/[fy:yyyy-yy]/[SEQ_EGOV_COMMON]" is-external-workflow-enabled: "true" - replicas: 2 - heap: "-Xmx512m -Xms512m" - memory_limits: "768Mi" + replicas: 3 + heap: "-Xmx1248m -Xms1248m" + memory_limits: "1468Mi" sms-pending-collection-enabled: false sms-todays-collection-enabled: false sms-edit-water-connection-notification-enabled: false @@ -396,7 +403,7 @@ vendor: egov-mdms-search-endpoint: "/mdms-v2/v1/_search" echallan-services: - replicas: 2 + replicas: 3 heap: "-Xmx512m -Xms512m" memory_limits: "768Mi" egov-idgen-challanNum-format: "EB-[fy:yyyy-yy]-[SEQ_EG_ECHALLAN_EXPENSE]" @@ -408,7 +415,7 @@ echallan-services: egov-url-shortner-endpoint: "/eus/shortener" echallan-calculator: - replicas: 2 + replicas: 3 ws-calculator: replicas: 2 @@ -568,11 +575,12 @@ gateway: replicas: 3 custom-filter-property: "false" tracing-enabled: "true" - heap: "-Xmx704m -Xms512m" + memory_limits: 1Gi + heap: "-Xmx768m -Xms768m" server-tomcat-max-threads: "350" server-tomcat-max-connections: "1500" egov-open-endpoints-whitelist: "/assam/user/oauth/token,/assam/user-otp/v1/_send,/assam/otp/v1/_validate,/assam/user/citizen/_create,/assam/localization/messages,/assam/localization/messages/v1/_search,/assam/user/password/nologin/_update,/assam/pgr/servicedefinition/v1/_search,/assam/pgr/servicecategories/v1/_search,/assam/pgr/v1/otp/_send,/assam/pgr-master/receivingmode/v1/_search,/assam/tenant/v1/tenant/_search,/assam/egov-location/boundarys,/assam/egov-location/boundarys/boundariesByBndryTypeNameAndHierarchyTypeName,/assam/pgr-master/service/v1/_search,/assam/egov-location/boundarys/getLocationByLocationName,/assam/pgr-master/OTPConfig/_search,/assam/pgr-master/serviceGroup/v1/_search,/assam/egov-location/boundarys/isshapefileexist,/assam/pgr/services/v1/_search,/assam/hr-masters/hrconfigurations/_search,/assam/collection-services/receipts/_view,/assam/pgr-master/service/v2/_search,/assam/pgr-master/servicedefinition/v1/_search,/assam/citizen-services,/assam/citizen-services/v1/requests/receipt/_create,/assam/citizen-services/v1/pgresponse,/assam/citizen-services/v1/requests/anonymous/_search,/assam/egov-mdms-service/v1/_search,/assam/egov-mdms-service/v1/_get,/assam/egov-mdms-service/v1/_reload,/assam/egov-mdms-service/v1/_reloadobj,/assam/egov-location/boundarys/getshapefile,/assam/egov-indexer/index-operations/_index,/assam/egov-indexer/index-operations/_reload,/assam/egov-mdms-service-test/v1/_search,/assam/egov-mdms-create/v1/_update,/assam/egov-mdms-create/v1/_create,/assam/egov-mdms-service-test/v1/_reload,/assam/filestore/v1/files/url,/assam/eus,/assam/adapter-master-data/department/v1/_search,/assam/ifix-department-entity/departmentEntity/hierarchyLevel/v1/_search,/assam/ifix-department-entity/departmentEntity/v1/_search,/assam/adapter-master-data/project/v1/_create,/assam/adapter-master-data/project/v1/_search,/assam/egov-location/location/v11/boundarys/_search,/assam/mdms-v2/v1/_search,/assam/mdms-v2/schema/v1/_search,/assam/mdms-v2/v1/_get,/assam/filestore/v1/files,/assam/filestore/v1/inactive" - egov-mixed-mode-endpoints-whitelist: "/assam/pgr/seva/v1/_create,/assam/pgr/seva/v1/_search,/assam/pgr/seva/v1/_count,/assam/workflow/history/v1/_search,/assam/filestore/v1/files/id,/assam/filestore/v1/files/tag,/assam/egov-common-masters/departments/_search,/assam/pt-property/property/propertytypes/_search,/assam/pt-property/properties/_search,/assam/pt-property/property/usages/_search,/assam/egov-idgen/id/_generate,/assam/egf-masters/financialyears/_search,/assam/egov-common-workflows/process/_start,/assam/egov-common-workflows/process/_search,/assam/egov-common-workflows/tasks,/assam/egov-common-workflows/tasks/{id}/_update,/assam/user/_search,/assam/billing-service/demand/_dues,/assam/billing-service/bill/_generate,/assam/billing-service/demand/_create,/assam/wcms/masters/waterchargesconfig/_search,/assam/wcms/masters/usagetypes/_search,/assam/wcms/masters/pipesizes/_search,/assam/wcms-connection/connection/_getbillingtypes,/assam/wcms-connection/connection/_getconnectiontypes,/assam/wcms/masters/sourcetypes/_search,/assam/wcms/masters/supplytypes/_search,/assam/wcms/masters/storagereservoirs/_search,/assam/wcms/masters/treatmentplants/_search,/assam/wcms/masters/documenttypes-applicationtypes/_search,/assam/wcms/masters/donations/_search,/assam/wcms/masters/nonmeterwaterrates/_search,/assam/wcms-connection/connection/_create,/assam/egov-common-masters/genders/_search,/assam/egov-common-workflows/designations/_search,/assam/access/v1/actions/mdms/_get,/assam/tl-services/v1/BPAREG/_create,/assam/tl-services/v1/BPAREG/_update,/assam/tl-calculator/v1/BPAREG/_getbill,/assam/property-services/property/_search,/assam/billing-service/bill/v2/_search,/assam/pg-service/transaction/v1/_create,/assam/collection-services/payments/_search,/assam/pdf-service/v1/_create,/assam/billing-service/bill/v2/_fetchbill,/assam/pg-service/transaction/v1/_update,/assam/ws-services/wc/_bulkonboard,/assam/ws-services/wc/_submitfeedback,/assam/ws-services/wc/_search,/assam/collection-services/payments/WS/_search,/assam/ws-calculator/waterCalculator/_getPenaltyDetails,/assam/billing-service/demand/_search,/assam/collection-services/payments/_create,/assam/pg-service/transaction/v1/_redirect,/assam/adapter-master-data/project/v1/_search,/assam/pg-service/transaction/v1/_search" + egov-mixed-mode-endpoints-whitelist: "/assam/egov-user-event/v1/events/_search,/assam/pgr/seva/v1/_create,/assam/pgr/seva/v1/_search,/assam/pgr/seva/v1/_count,/assam/workflow/history/v1/_search,/assam/filestore/v1/files/id,/assam/filestore/v1/files/tag,/assam/egov-common-masters/departments/_search,/assam/pt-property/property/propertytypes/_search,/assam/pt-property/properties/_search,/assam/pt-property/property/usages/_search,/assam/egov-idgen/id/_generate,/assam/egf-masters/financialyears/_search,/assam/egov-common-workflows/process/_start,/assam/egov-common-workflows/process/_search,/assam/egov-common-workflows/tasks,/assam/egov-common-workflows/tasks/{id}/_update,/assam/user/_search,/assam/billing-service/demand/_dues,/assam/billing-service/bill/_generate,/assam/billing-service/demand/_create,/assam/wcms/masters/waterchargesconfig/_search,/assam/wcms/masters/usagetypes/_search,/assam/wcms/masters/pipesizes/_search,/assam/wcms-connection/connection/_getbillingtypes,/assam/wcms-connection/connection/_getconnectiontypes,/assam/wcms/masters/sourcetypes/_search,/assam/wcms/masters/supplytypes/_search,/assam/wcms/masters/storagereservoirs/_search,/assam/wcms/masters/treatmentplants/_search,/assam/wcms/masters/documenttypes-applicationtypes/_search,/assam/wcms/masters/donations/_search,/assam/wcms/masters/nonmeterwaterrates/_search,/assam/wcms-connection/connection/_create,/assam/egov-common-masters/genders/_search,/assam/egov-common-workflows/designations/_search,/assam/access/v1/actions/mdms/_get,/assam/tl-services/v1/BPAREG/_create,/assam/tl-services/v1/BPAREG/_update,/assam/tl-calculator/v1/BPAREG/_getbill,/assam/property-services/property/_search,/assam/billing-service/bill/v2/_search,/assam/pg-service/transaction/v1/_create,/assam/collection-services/payments/_search,/assam/pdf-service/v1/_create,/assam/billing-service/bill/v2/_fetchbill,/assam/pg-service/transaction/v1/_update,/assam/ws-services/wc/_bulkonboard,/assam/ws-services/wc/_submitfeedback,/assam/ws-services/wc/_search,/assam/collection-services/payments/WS/_search,/assam/ws-calculator/waterCalculator/_getPenaltyDetails,/assam/billing-service/demand/_search,/assam/collection-services/payments/_create,/assam/pg-service/transaction/v1/_redirect,/assam/adapter-master-data/project/v1/_search,/assam/pg-service/transaction/v1/_search,/assam/billing-service/demand/_getAggregateDemandDetails,/assam/egov-hrms/employees/_searchListOfEmployee" # <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< @@ -600,6 +608,10 @@ finance-collections-voucher-consumer: user-otp: logging-level: "DEBUG" + memory_limit: 512Mi + +egov-otp: + memory_limits: 512Mi pt-services-v2: From 00facb97658c6d64e3ff5b1ca18e2ff0405b3306 Mon Sep 17 00:00:00 2001 From: Hari-egov <168806306+Hari-egov@users.noreply.github.com> Date: Mon, 30 Dec 2024 12:04:20 +0530 Subject: [PATCH 7/7] Update assam-prod.yaml Global Configs Updated HRMS & WORKBENCH UI --- deploy-as-code/helm/environments/assam-prod.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/deploy-as-code/helm/environments/assam-prod.yaml b/deploy-as-code/helm/environments/assam-prod.yaml index 5dcd995cb..451769697 100644 --- a/deploy-as-code/helm/environments/assam-prod.yaml +++ b/deploy-as-code/helm/environments/assam-prod.yaml @@ -247,23 +247,22 @@ frontend-mgramseva: state-level-tenant-id: as custom-js-injection: | sub_filter.conf: " - sub_filter '' ' - - ';" + sub_filter.conf: "sub_filter '' '';" mgramseva-web: react-app-public-path: "/assam/mgramseva-web/" custom-js-injection: | sub_filter.conf: " sub_filter '' ' - + ';" workbench-ui: custom-js-injection: | sub_filter.conf: " sub_filter '' ' - ';" + ' + ';" egov-user-event: memory_limits: 512Mi