[DSD-7089] updated helm and deploy for helm publish

charts/data-archive/templates/archive-env-configmap.yaml

@@ -17,7 +17,7 @@ data:
   DB_SERVERIP: {{ .Values.databases.archive_db.host | quote }}
   DB_PORT: {{ .Values.databases.archive_db.port | quote }}
   DML_FLAG: {{ .Values.databases.archive_db.dml | quote }}
-  DB_NAMES: {{ .Values.databases.source_db.provide_db_names_to_archive | quote }}
+  BATCH_SIZE: {{ .Values.databases.archive_db.batch_size | quote }}
   AUDIT_SOURCE_DB_HOST: {{ .Values.databases.source_db.source_audit_host | quote }}
   AUDIT_SOURCE_DB_PORT: {{ .Values.databases.source_db.source_audit_port | quote }}
   AUDIT_SOURCE_DB_UNAME: {{ .Values.databases.source_db.source_audit_uname | quote }}
@@ -77,5 +77,4 @@ data:
   ARCHIVE_DB_PORT: {{ .Values.databases.archive_db.archiveport | quote }}
   ARCHIVE_DB_UNAME: {{ .Values.databases.archive_db.archiveuname | quote }}
   ARCHIVE_DB_NAME: {{ .Values.databases.archive_db.archive_dbname | quote }}
-  ARCHIVE_SCHEMA_NAME: {{ .Values.databases.archive_db.archive_schemaname | quote }}
-  CONTAINER_VOLUME_PATH: {{ .Values.databases.container_volume_path | quote }}
+  ARCHIVE_SCHEMA_NAME: {{ .Values.databases.archive_db.archive_schemaname | quote }}

charts/data-archive/templates/cronjob.yaml

@@ -1,13 +1,15 @@
+{{- range $dbnames := $.Values.databases.db_names }}
+{{- if $dbnames.enabled }}
+---
 apiVersion: {{ include "common.capabilities.cronjob.apiVersion" $ }}
 kind: CronJob
 metadata:
-  name: {{ template "data-archive.cronjob" $ }}
+  name: {{ template "data-archive.cronjob" $ }}-{{ $dbnames.name }}
   namespace: {{ $.Release.Namespace }}
 spec:
   concurrencyPolicy: Forbid
   successfulJobsHistoryLimit: 1  # remove jobs which are successfully executed
   failedJobsHistoryLimit: 1      # except 1 recent failed job, remove jobs which are not successfully executed
-  #schedule: '*/3 * * * *' # cron spec of time, here, 8 o'clock
   schedule: {{ $.Values.crontime }}
   jobTemplate:
     spec:
@@ -19,24 +21,35 @@ spec:
       template:
         spec:
           restartPolicy: Never
-          containers:
-            - name: {{ template "data-archive.serviceAccountName" $ }}
-              image: {{ template "data-archive.image" $ }}
-              imagePullPolicy: {{ $.Values.image.pullPolicy }}
-              volumeMounts:
-              - name: config-volume
-                mountPath: /all-db-info-json
-              env:
-                - name: container_user
-                  value: {{ $.Values.containerSecurityContext.runAsUser }}
-              envFrom:
-                - configMapRef:
-                    name: db-archive-init-env-config
-                - secretRef:
-                    name: source-db-secrets
-                - secretRef:
-                    name: archive-db-secrets
+          serviceAccountName: {{ template "data-archive.serviceAccountName" $ }}
+          containers: 
+          - name: {{ template "data-archive.serviceAccountName" $ }}-{{ $dbnames.name }}
+            image: {{ template "data-archive.image" $ }}
+            imagePullPolicy: {{ $.Values.image.pullPolicy }}
+            volumeMounts:
+            - name: config-volume-{{ $dbnames.name }}  # Unique volume mount path for each job
+              mountPath: {{ $dbnames.container_volume_path | quote }}  # Dynamic volume path from values.yaml
+            env: 
+              - name: CONTAINER_VOLUME_PATH
+                value: {{ $dbnames.container_volume_path | quote }}  # Set dynamic CONTAINER_VOLUME_PATH
+              - name: container_user
+                value: {{ $.Values.containerSecurityContext.runAsUser }}
+              - name: DB_NAMES
+                value: {{ $dbnames.name | upper }}
+            envFrom:
+              - configMapRef:
+                  name: db-archive-init-env-config
+              - secretRef:
+                  name: source-db-secrets
+              - secretRef:
+                  name: archive-db-secrets
+            {{- if $.Values.resources }}
+            resources: {{- toYaml $.Values.resources | nindent 14 }}
+            {{- end }}
           volumes:
-          - name: config-volume
-            configMap:
-              name: {{ .Release.Name }}
+            - name: config-volume-{{ $dbnames.name }}  # Unique config-volume per job
+              configMap:
+                name: {{ $.Release.Name }}
+
+{{- end }}
+{{- end }}

charts/data-archive/values.yaml

@@ -68,10 +68,10 @@ resources:
   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
   limits:
     cpu: 1000m
-    memory: 3500Mi
+    memory: 1000Mi
   requests:
-    cpu: 1000m
-    memory: 3500Mi
+    cpu: 300m
+    memory: 700Mi
 
 # additionalResources:
   ## Specify any JAVA_OPTS string here. These typically will be specified in conjunction with above resources
@@ -298,11 +298,6 @@ serviceAccount:
   ##
   name:
 
-## Admin swagger should have only internal access. Hence linked to internal gateway
-istio:
-  enabled: false
-  gateways:
-    - istio-system/internal
 
 crontime: "0 4 * * *"    ## run cronjob every day at 4 AM in GMT which is 9.30 AM in IST (time hr: 0-23 )
 
@@ -321,8 +316,44 @@ databases:
     archive_dbname: "mosip_archive"
     archive_schemaname: "archive"
     archive_db_password: ""
+    batch_size: 1000
+
+  db_names:
+    - name: audit
+      enabled: true
+      container_volume_path: /audit-table-info  ## volume mount path for table info inside cronjob container
+    - name: ida
+      enabled: true
+      container_volume_path: /ida-table-info  ## volume mount path for table info inside cronjob container
+    - name: credential
+      enabled: true
+      container_volume_path: /credential-table-info  ## volume mount path for table info inside cronjob container
+    - name: kernel
+      enabled: true
+      container_volume_path: /kernel-table-info  ## volume mount path for table info inside cronjob container
+    - name: master
+      enabled: true
+      container_volume_path: /master-table-info  ## volume mount path for table info inside cronjob container
+    - name: pms
+      enabled: true
+      container_volume_path: /pms-table-info  ## volume mount path for table info inside cronjob container
+    - name: regprc
+      enabled: true
+      container_volume_path: /regprc-table-info  ## volume mount path for table info inside cronjob container
+    - name: resident
+      enabled: true
+      container_volume_path: /resident-table-info  ## volume mount path for table info inside cronjob container
+    - name: idrepo
+      enabled: true
+      container_volume_path: /idrepo-db-info-json
+    - name: prereg
+      enabled: true
+      container_volume_path: /prereg-db-info-json
+    - name: esignet
+      enabled: true
+      container_volume_path: /esignet-db-info-json
+
   source_db:
-    provide_db_names_to_archive: "AUDIT,IDA"
     source_audit_host: "api-internal.sandbox.xyz.net"
     source_audit_port: 5432
     source_audit_uname: "audituser"
@@ -389,7 +420,6 @@ databases:
     source_resident_dbname: "mosip_resident"
     source_resident_schemaname: "resident"
     source_resident_db_pass: ""
-  container_volume_path: "/all-db-info-json"  ## volume mount path for table info inside cronjob container
   all_db_tables_info:
     audit:
       tables_info:
@@ -405,7 +435,7 @@ databases:
         archive_table: "mosip_credential_credential_transaction"
         id_column: "id"
         date_column: "cr_dtimes"
-        retension_days: 30
+        retention_days: 30
         operation_type: "archive_delete"
     esignet:
       tables_info:
@@ -421,169 +451,169 @@ databases:
         archive_table: "mosip_ida_credential_event_store"
         id_column: "event_id"
         date_column: "cr_dtimes"
-        retension_days: 30
+        retention_days: 30
         operation_type: "archive_delete"
       - source_table: "otp_transaction"
         archive_table: "mosip_ida_otp_transaction"
         id_column: "id"
         date_column: "cr_dtimes"
-        retension_days: 30
+        retention_days: 30
         operation_type: 'delete'
     idrepo:
       tables_info:
       - source_table: "anonymous_profile"
         archive_table: "mosip_idrepo_anonymous_profile"
         id_column: "id"
         date_column: "cr_dtimes"
-        retension_days: 30
+        retention_days: 30
         operation_type: "archive_delete"
       - source_table: "credential_request_status"
         archive_table: "mosip_idrepo_credential_request_status"
         id_column: "individual_id"
         date_column: "cr_dtimes"
-        retension_days: 30
+        retention_days: 30
         operation_type: "archive_delete"
       - source_table: "uin_draft"
         archive_table: "mosip_idrepo_uin_draft"
         id_column: "id"
         date_column: "cr_dtimes"
-        retension_days: 30
+        retention_days: 30
         operation_type: "archive_delete"
     kernel:
       tables_info:
       - source_table: "otp_transaction"
         archive_table: "mosip_kernel_otp_transaction"
         id_column: "id"
         date_column: "generated_dtimes"
-        retension_days: 7
+        retention_days: 7
         operation_type: "delete"
     master:
       tables_info:
       - source_table: "bulkupload_transaction"
         archive_table: "mosip_master_bulkupload_transaction"
         id_column: "id"
         date_column: "cr_dtimes"
-        retension_days: 91
+        retention_days: 91
         operation_type: "archive_delete"
       - source_table: "device_master_h"
         archive_table: "mosip_master_device_master_h"
         id_column: "id"
         date_column: "cr_dtimes"
-        retension_days: 365
+        retention_days: 365
         operation_type: "archive_delete"
       - source_table: "machine_master_h"
         archive_table: "mosip_master_machine_master_h"
         id_column: "id"
         date_column: "cr_dtimes"
-        retension_days: 183
+        retention_days: 183
         operation_type: "archive_delete"
       - source_table: "registration_center_h"
         archive_table: "mosip_master_registration_center_h"
         id_column: "id"
         date_column: "cr_dtimes"
-        retension_days: 365
+        retention_days: 365
         operation_type: "archive_delete"
       - source_table: "user_detail_h"
         archive_table: "mosip_master_user_detail_h"
         id_column: "id"
         date_column: "cr_dtimes"
-        retension_days: 183
+        retention_days: 183
         operation_type: "archive_delete"
       - source_table: "zone_user_h"
         archive_table: "mosip_master_zone_user_h"
-        id_column: "usr_id"
+        id_column: "zone_code"
         date_column: "cr_dtimes"
-        retension_days: 183
+        retention_days: 183
         operation_type: "archive_delete"
     pms:
       tables_info:
       - source_table: "auth_policy_h"
         archive_table: "mosip_pms_auth_policy_h"
         id_column: "id"
         date_column: "cr_dtimes"
-        retension_days: 183
+        retention_days: 183
         operation_type: "archive_delete"
       - source_table: "secure_biometric_interface_h"
         archive_table: "mosip_pms_secure_biometric_interface_h"
         id_column: "id"
         date_column: "cr_dtimes"
-        retension_days: 183
+        retention_days: 183
         operation_type: "archive_delete"
       - source_table: "partner_h"
         archive_table: "mosip_pms_partner_h"
         id_column: "id"
         date_column: "cr_dtimes"
-        retension_days: 183
+        retention_days: 183
         operation_type: "archive_delete"
     prereg:
       tables_info:
       - source_table: "otp_transaction"
         archive_table: "mosip_prereg_otp_transaction"
         id_column: "id"
         date_column: "cr_dtimes"
-        retension_days: 30
+        retention_days: 30
         operation_type: "delete"
     regprc:
       tables_info:
       - source_table: "abis_response_det"
         archive_table: "mosip_regprc_abis_response_det"
         id_column: "abis_resp_id"
         date_column: "cr_dtimes"
-        retension_days: 183
+        retention_days: 183
         operation_type: "archive_delete"
       - source_table: "abis_response"
         archive_table: "mosip_regprc_abis_response"
         id_column: "id"
         date_column: "cr_dtimes"
-        retension_days: 183
+        retention_days: 183
         operation_type: "archive_delete"
       - source_table: "abis_request"
         archive_table: "mosip_regprc_abis_request"
         id_column: "id"
         date_column: "cr_dtimes"
-        retension_days: 183
+        retention_days: 183
         operation_type: "archive_delete"
       - source_table: "reg_demo_dedupe_list"
         archive_table: "mosip_regprc_reg_demo_dedupe_list"
         id_column: "id"
         date_column: "cr_dtimes"
-        retension_days: 183
+        retention_days: 183
         operation_type: "archive_delete"
       - source_table: "registration_transaction"
         archive_table: "mosip_regprc_registration_transaction"
         id_column: "regtrn_id"
         date_column: "cr_dtimes"
-        retension_days: 183
+        retention_days: 183
         operation_type: "archive_delete"
     resident:
       tables_info:
       - source_table: "otp_transaction"
         archive_table: "mosip_resident_otp_transaction"
         id_column: "id"
         date_column: "cr_dtimes"
-        retension_days: 30
+        retention_days: 30
         operation_type: "delete"
       - source_table: "resident_grievance_ticket"
         archive_table: "mosip_resident_grievance_ticket"
         id_column: "id"
         date_column: "cr_dtimes"
-        retension_days: 365
+        retention_days: 365
         operation_type: "archive_delete"
       - source_table: "resident_session"
         archive_table: "mosip_resident_session"
         id_column: "session_id"
         date_column: "login_dtimes"
-        retension_days: 30
+        retention_days: 30
         operation_type: "archive_delete"
       - source_table: "resident_transaction"
         archive_table: "mosip_resident_transaction"
         id_column: "id"
         date_column: "cr_dtimes"
-        retension_days: 365
+        retention_days: 365
         operation_type: "archive_delete"
       - source_table: "resident_user_actions"
         archive_table: "mosip_resident_user_actions"
         id_column: "ida_token"
         date_column: "last_bell_notif_click_dtimes"
-        retension_days: 365
+        retention_days: 365
         operation_type: "archive_delete"