merge LTS-upgrade

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:

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:
@@ -134,3 +136,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

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

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

deploy-as-code/helm/charts/core-services/audit-service/templates/deployment.yaml

@@ -0,0 +1,2 @@
+# deployment.yaml
+{{- template "common.deployment" . -}}

deploy-as-code/helm/charts/core-services/audit-service/templates/ingress.yaml

@@ -0,0 +1,2 @@
+# ingress.yaml
+{{- template "common.ingress" . -}}

deploy-as-code/helm/charts/core-services/audit-service/templates/service.yaml

@@ -0,0 +1,2 @@
+# service.yaml
+{{- template "common.service" . -}}

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

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

deploy-as-code/helm/charts/core-services/boundary-service/templates/deployment.yaml

@@ -0,0 +1,2 @@
+# deployment.yaml
+{{- template "common.deployment" . -}}

deploy-as-code/helm/charts/core-services/boundary-service/templates/ingress.yaml

@@ -0,0 +1,2 @@
+# ingress.yaml
+{{- template "common.ingress" . -}}

deploy-as-code/helm/charts/core-services/boundary-service/templates/service.yaml

@@ -0,0 +1,2 @@
+# service.yaml
+{{- template "common.service" . -}}

deploy-as-code/helm/charts/core-services/boundary-service/values.yaml

@@ -0,0 +1,119 @@
+# 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: |
+  {{- 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
+    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: BOUNDARY_SERVICE_URI
+    value: {{ index .Values "egov-boundary-relationship-search-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

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
 

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

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:

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

deploy-as-code/helm/charts/core-services/egov-url-shortening-mgs/templates/deployment.yaml

@@ -0,0 +1,2 @@
+# deployment.yaml
+{{- template "common.deployment" . -}}

deploy-as-code/helm/charts/core-services/egov-url-shortening-mgs/templates/ingress.yaml

@@ -0,0 +1,2 @@
+# ingress.yaml
+{{- template "common.ingress" . -}}

deploy-as-code/helm/charts/core-services/egov-url-shortening-mgs/templates/service.yaml

@@ -0,0 +1,2 @@
+# service.yaml
+{{- template "common.service" . -}}