From ca2ae1d33b267329ad587a357601fe0ca86fb33a Mon Sep 17 00:00:00 2001
From: Haritest <haridasksd@gmail.com>
Date: Thu, 19 Sep 2024 10:20:07 +0530
Subject: [PATCH 01/31] Update sb-cb-ext-service-env.j2 single quote removed

---
 .../sb-cb-ext-service/files/sb-cb-ext-service-env.j2        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kubernetes/helm_charts/igot-deploy/sb-cb-ext-service/files/sb-cb-ext-service-env.j2 b/kubernetes/helm_charts/igot-deploy/sb-cb-ext-service/files/sb-cb-ext-service-env.j2
index 93929b3ac1..75bfcbdde4 100644
--- a/kubernetes/helm_charts/igot-deploy/sb-cb-ext-service/files/sb-cb-ext-service-env.j2
+++ b/kubernetes/helm_charts/igot-deploy/sb-cb-ext-service/files/sb-cb-ext-service-env.j2
@@ -435,6 +435,6 @@ designation.competency.bulk.upload.update.threshold.value=10
 
 competency.selected.version=competencies_v6
 competency.selected.version.facets.map={"competencies_v6":"competencies_v6.competencyAreaName,competencies_v6.competencyThemeName,competencies_v6.competencySubThemeName","competencies_v5":"competencies_v5.competencyArea,competencies_v5.competencyTheme,competencies_v5.competencySubTheme"}
-national.learning.insights.fields='{{national_learning_insights_fields}}'
-national.learning.insights.property.fields='{"valueColor": "#FFFFFF","labelColor": "#FFFFFF","linebreak":"false","background": "#1B4CA1","iconColor": "#FFFFFF"}'
-national.learning.insights.redis.key.mapping='{"Certificate Issued Yesterday":"dashboard_content_certificates_generated_yday_nlw_count","Total Certificate Issued So Far":"dashboard_content_certificates_generated_nlw_count","Events Published":"dashboard_events_published_nlw_count","Total Enrolments":"dashboard_content_enrolment_nlw_count"}'
+national.learning.insights.fields={{national_learning_insights_fields}}
+national.learning.insights.property.fields={"valueColor": "#FFFFFF","labelColor": "#FFFFFF","linebreak":"false","background": "#1B4CA1","iconColor": "#FFFFFF"}
+national.learning.insights.redis.key.mapping={"Certificate Issued Yesterday":"dashboard_content_certificates_generated_yday_nlw_count","Total Certificate Issued So Far":"dashboard_content_certificates_generated_nlw_count","Events Published":"dashboard_events_published_nlw_count","Total Enrolments":"dashboard_content_enrolment_nlw_count"}

From f81c904e3426424971c77bd045451dcda32c234c Mon Sep 17 00:00:00 2001
From: Haritest <haridasksd@gmail.com>
Date: Thu, 19 Sep 2024 10:23:41 +0530
Subject: [PATCH 02/31] Update sb-cb-ext-service-env.j2

---
 .../sb-cb-ext-service/files/sb-cb-ext-service-env.j2            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubernetes/helm_charts/igot-deploy/sb-cb-ext-service/files/sb-cb-ext-service-env.j2 b/kubernetes/helm_charts/igot-deploy/sb-cb-ext-service/files/sb-cb-ext-service-env.j2
index 75bfcbdde4..4b781f7596 100644
--- a/kubernetes/helm_charts/igot-deploy/sb-cb-ext-service/files/sb-cb-ext-service-env.j2
+++ b/kubernetes/helm_charts/igot-deploy/sb-cb-ext-service/files/sb-cb-ext-service-env.j2
@@ -435,6 +435,6 @@ designation.competency.bulk.upload.update.threshold.value=10
 
 competency.selected.version=competencies_v6
 competency.selected.version.facets.map={"competencies_v6":"competencies_v6.competencyAreaName,competencies_v6.competencyThemeName,competencies_v6.competencySubThemeName","competencies_v5":"competencies_v5.competencyArea,competencies_v5.competencyTheme,competencies_v5.competencySubTheme"}
-national.learning.insights.fields={{national_learning_insights_fields}}
+national.learning.insights.fields={{ national_learning_insights_fields }}
 national.learning.insights.property.fields={"valueColor": "#FFFFFF","labelColor": "#FFFFFF","linebreak":"false","background": "#1B4CA1","iconColor": "#FFFFFF"}
 national.learning.insights.redis.key.mapping={"Certificate Issued Yesterday":"dashboard_content_certificates_generated_yday_nlw_count","Total Certificate Issued So Far":"dashboard_content_certificates_generated_nlw_count","Events Published":"dashboard_events_published_nlw_count","Total Enrolments":"dashboard_content_enrolment_nlw_count"}

From f0f72829bc07311579e85881974518837b0f7c39 Mon Sep 17 00:00:00 2001
From: Haridas <haridas.kakunje@tarento.com>
Date: Thu, 19 Sep 2024 10:45:34 +0530
Subject: [PATCH 03/31] envjson and hostconfig updated for ui-static

---
 .../helm_charts/igot-deploy/ui-static/values.j2 | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/kubernetes/helm_charts/igot-deploy/ui-static/values.j2 b/kubernetes/helm_charts/igot-deploy/ui-static/values.j2
index 461c40a516..4ade66ed43 100644
--- a/kubernetes/helm_charts/igot-deploy/ui-static/values.j2
+++ b/kubernetes/helm_charts/igot-deploy/ui-static/values.j2
@@ -27681,6 +27681,22 @@ siteconfig: |
       "active": false
     }
   ],
+  "compentency": {
+      "competencies_v5": {
+        "vKey": "competencies_v5",
+        "vCompetencyArea": "competencyArea",
+        "vCompetencyAreaDescription": "competencyAreaDescription",
+        "vCompetencyTheme": "competencyTheme",
+        "vCompetencySubTheme": "competencySubTheme"
+      },
+      "competencies_v6": {
+        "vKey": "competencies_v6",
+        "vCompetencyArea": "competencyAreaName",
+        "vCompetencyAreaDescription": "competencyAreaDescription",
+        "vCompetencyTheme": "competencyThemeName",
+        "vCompetencySubTheme": "competencySubThemeName"
+      }
+   },
   "npsCategory": "NPS2"
   }
 appsjson: |-
@@ -28537,6 +28553,7 @@ envjson: |-
     "mdoChannelsBookmarkId": "{{ mdochannelsbookmarkid }}",
     "apiCache": "3",
     "portalRoles": "{{ igot_karmayoggirules }}",
+    "compentencyVersionKey": "competencies_v5"
     "portals": [
         { "sr": 2, "id": "cbp", "name": "CBP Portal", "desc": "Create and manage CBPs here", "icon": "add_moderator", "uriPath": "https://{{ cbp_domain_name }}", "roles": ["CBP_ADMIN", "CONTENT_CREATOR", "CONTENT_REVIEWER", "CONTENT_PUBLISHER", "SPV_PUBLISHER", "cbp_admin", "content_creator", "content_reviewer", "content_publisher", "spv_publisher", "program_coordinator"], "isPublic": false },
         { "sr": 1, "id": "cbc", "name": "CBC Portal", "desc": "Capacity Building Commission", "icon": "add_moderator", "uriPath": "https://{{ cbc_portal_url }}", "roles": ["CBC_ADMIN", "CBC_MEMBER", "cbc_admin", "cbc_member"], "isPublic": false },

From e5e15c776ff7d70473cf4e27d3252f67f04ff317 Mon Sep 17 00:00:00 2001
From: Haridas <haridas.kakunje@tarento.com>
Date: Thu, 19 Sep 2024 10:52:41 +0530
Subject: [PATCH 04/31] envjson and updated for uistatic

---
 kubernetes/helm_charts/igot-deploy/ui-static/values.j2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kubernetes/helm_charts/igot-deploy/ui-static/values.j2 b/kubernetes/helm_charts/igot-deploy/ui-static/values.j2
index 4ade66ed43..9803890179 100644
--- a/kubernetes/helm_charts/igot-deploy/ui-static/values.j2
+++ b/kubernetes/helm_charts/igot-deploy/ui-static/values.j2
@@ -28553,7 +28553,6 @@ envjson: |-
     "mdoChannelsBookmarkId": "{{ mdochannelsbookmarkid }}",
     "apiCache": "3",
     "portalRoles": "{{ igot_karmayoggirules }}",
-    "compentencyVersionKey": "competencies_v5"
     "portals": [
         { "sr": 2, "id": "cbp", "name": "CBP Portal", "desc": "Create and manage CBPs here", "icon": "add_moderator", "uriPath": "https://{{ cbp_domain_name }}", "roles": ["CBP_ADMIN", "CONTENT_CREATOR", "CONTENT_REVIEWER", "CONTENT_PUBLISHER", "SPV_PUBLISHER", "cbp_admin", "content_creator", "content_reviewer", "content_publisher", "spv_publisher", "program_coordinator"], "isPublic": false },
         { "sr": 1, "id": "cbc", "name": "CBC Portal", "desc": "Capacity Building Commission", "icon": "add_moderator", "uriPath": "https://{{ cbc_portal_url }}", "roles": ["CBC_ADMIN", "CBC_MEMBER", "cbc_admin", "cbc_member"], "isPublic": false },
@@ -28564,7 +28563,8 @@ envjson: |-
     "recaptchaKey": "{{ igot_recaptchakey }}",
     "supportEmail": "mission.karmayogi@gov.in",
     "providerDataKey": "{{ providerdatakey }}",
-    "resendOTPTIme": 180
+    "resendOTPTIme": 180,
+    "compentencyVersionKey": "competencies_v5"
   }    
 
 

From b71d67cbf2f7dd2c554156d281c30659d7a741bd Mon Sep 17 00:00:00 2001
From: Haridas <haridas.kakunje@tarento.com>
Date: Thu, 19 Sep 2024 11:31:33 +0530
Subject: [PATCH 05/31] envjson and updated for uistatic

---
 .../igot-deploy/ui-static/values.j2            | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/kubernetes/helm_charts/igot-deploy/ui-static/values.j2 b/kubernetes/helm_charts/igot-deploy/ui-static/values.j2
index 9803890179..5f9f311ea3 100644
--- a/kubernetes/helm_charts/igot-deploy/ui-static/values.j2
+++ b/kubernetes/helm_charts/igot-deploy/ui-static/values.j2
@@ -13654,7 +13654,23 @@ hostconfig: |-
        
     
     ]
-  }
+  },
+  "compentency": {
+      "competencies_v5": {
+        "vKey": "competencies_v5",
+        "vCompetencyArea": "competencyArea",
+        "vCompetencyAreaDescription": "competencyAreaDescription",
+        "vCompetencyTheme": "competencyTheme",
+        "vCompetencySubTheme": "competencySubTheme"
+      },
+      "competencies_v6": {
+        "vKey": "competencies_v6",
+        "vCompetencyArea": "competencyAreaName",
+        "vCompetencyAreaDescription": "competencyAreaDescription",
+        "vCompetencyTheme": "competencyThemeName",
+        "vCompetencySubTheme": "competencySubThemeName"
+      }
+   }
 siteconfig: |
 
  {

From a0b615fe828f3ea05245ea1871505cc4d08b0853 Mon Sep 17 00:00:00 2001
From: Haridas <haridas.kakunje@tarento.com>
Date: Thu, 19 Sep 2024 11:39:36 +0530
Subject: [PATCH 06/31] envjson and updated for uistatic

---
 kubernetes/helm_charts/igot-deploy/ui-static/values.j2 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kubernetes/helm_charts/igot-deploy/ui-static/values.j2 b/kubernetes/helm_charts/igot-deploy/ui-static/values.j2
index 5f9f311ea3..dab8d5fae2 100644
--- a/kubernetes/helm_charts/igot-deploy/ui-static/values.j2
+++ b/kubernetes/helm_charts/igot-deploy/ui-static/values.j2
@@ -13652,10 +13652,8 @@ hostconfig: |-
       "description": "SUPERINTENDING GEOPHYSICIST"
     }
        
-    
-    ]
-  },
-  "compentency": {
+   ],
+   "compentency": {
       "competencies_v5": {
         "vKey": "competencies_v5",
         "vCompetencyArea": "competencyArea",
@@ -13671,6 +13669,8 @@ hostconfig: |-
         "vCompetencySubTheme": "competencySubThemeName"
       }
    }
+  } 
+  
 siteconfig: |
 
  {

From 259937c4a6844bee2c76d69af917189925d0cb2b Mon Sep 17 00:00:00 2001
From: pathiktarento1089 <123535830+pathiktarento1089@users.noreply.github.com>
Date: Thu, 19 Sep 2024 15:14:56 +0530
Subject: [PATCH 07/31] updating kong api for user progress weekly report api

---
 ansible/roles/kong-api/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml
index 595e3847a7..aafbd8a1e9 100644
--- a/ansible/roles/kong-api/defaults/main.yml
+++ b/ansible/roles/kong-api/defaults/main.yml
@@ -16679,7 +16679,7 @@ kong_apis:
 
   - name: hallOfFameUserLeaderBoard
     uris: "{{ halloffame_prefix }}/v1/userleaderboard"
-    upstream_url: "{{ sb_cb_ext_service_url }}/v1/halloffame/org/read"
+    upstream_url: "{{ sb_cb_ext_service_url }}/v1/halloffame/user/read"
     strip_uri: true
     plugins:
     - name: jwt

From 0a86a774c2e86b4f0052f03bc07ec4ac1079a4ce Mon Sep 17 00:00:00 2001
From: sahilchaudhary <sahil.chaudhary@tarento.com>
Date: Thu, 19 Sep 2024 17:09:53 +0530
Subject: [PATCH 08/31] Adding the designationMapping for bulk Upload

---
 ansible/roles/kong-api/defaults/main.yml | 84 ++++++++++++++++++++++--
 1 file changed, 78 insertions(+), 6 deletions(-)

diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml
index aafbd8a1e9..8f1165792c 100644
--- a/ansible/roles/kong-api/defaults/main.yml
+++ b/ansible/roles/kong-api/defaults/main.yml
@@ -17703,9 +17703,9 @@ kong_apis:
       - name: request-size-limiting
         config.allowed_payload_size: "{{ medium_request_size_limit }}"        
 
-  - name: fileDownloadForCompetencyOrganisationMappingForOrg
-    uris: "{{ organisation_prefix }}/v1/getCompetencyDesignationMappingFile"
-    upstream_url: "{{ sb_cb_ext_service_url }}/organisation/v1/getCompetencyMappingFile"
+  - name: sampleFileDownloadForCompetencyOrganisationMappingForOrg
+    uris: "{{ organisation_prefix }}/v1/getCompetencyDesignationMappingFile/sample"
+    upstream_url: "{{ sb_cb_ext_service_url }}/organisation/v1/getCompetencyMappingFile/sample"
     strip_uri: true
     plugins:
       - name: jwt
@@ -17739,9 +17739,9 @@ kong_apis:
       - name: request-size-limiting
         config.allowed_payload_size: "{{ medium_request_size_limit }}"
 
-  - name: bulkUploadForCompetencyOrganisationMappingDetailsForOrg
-    uris: "{{ organisation_prefix }}/v1/competencyDesignationMappings/bulkUpload/details"
-    upstream_url: "{{ sb_cb_ext_service_url }}/organisation/v1/competencyDesignationMappings/details/bulkUpload"
+  - name: bulkUploadForCompetencyOrganisationMappingProgressDetailsForOrg
+    uris: "{{ organisation_prefix }}/v1/competencyDesignationMappings/bulkUpload/progress/details"
+    upstream_url: "{{ sb_cb_ext_service_url }}/organisation/v1/competencyDesignationMappings/progress/details/bulkUpload"
     strip_uri: true
     plugins:
       - name: jwt
@@ -17792,3 +17792,75 @@ kong_apis:
        config.limit_by: credential
      - name: request-size-limiting
        config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: sampleFileDownloadForOrganisationDesignationMapping
+    uris: "{{ designation_prefix }}/v1/orgMapping/sample"
+    upstream_url: "{{ sb_cb_ext_service_url }}/designation/v1/orgMapping/sample"
+    strip_uri: true
+    plugins:
+      - name: jwt
+      - name: cors
+      - "{{ statsd_pulgin }}"
+      - name: acl
+        config.whitelist:
+          - 'dataAccess'
+      - name: rate-limiting
+        config.policy: local
+        config.hour: "{{ medium_rate_limit_per_hour }}"
+        config.limit_by: credential
+      - name: request-size-limiting
+        config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: bulkUploadForOrganisationDesignationMapping
+    uris: "{{ designation_prefix }}/v1/orgMapping/bulkUpload"
+    upstream_url: "{{ sb_cb_ext_service_url }}/designation/v1/orgMapping/bulkUpload"
+    strip_uri: true
+    plugins:
+      - name: jwt
+      - name: cors
+      - "{{ statsd_pulgin }}"
+      - name: acl
+        config.whitelist:
+          - 'dataAccess'
+      - name: rate-limiting
+        config.policy: local
+        config.hour: "{{ medium_rate_limit_per_hour }}"
+        config.limit_by: credential
+      - name: request-size-limiting
+        config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: bulkUploadForOrganisationDesignationMappingProgressDetails
+    uris: "{{ designation_prefix }}/v1/orgMapping/bulkUpload/progress/details"
+    upstream_url: "{{ sb_cb_ext_service_url }}/designation/v1/orgMapping/progress/details/bulkUpload"
+    strip_uri: true
+    plugins:
+      - name: jwt
+      - name: cors
+      - "{{ statsd_pulgin }}"
+      - name: acl
+        config.whitelist:
+          - 'dataAccess'
+      - name: rate-limiting
+        config.policy: local
+        config.hour: "{{ medium_rate_limit_per_hour }}"
+        config.limit_by: credential
+      - name: request-size-limiting
+        config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: bulkUploadFileDownloadFileForOrganisationDesignationMapping
+    uris: "{{ designation_prefix }}/v1/orgMapping/download"
+    upstream_url: "{{ sb_cb_ext_service_url }}/designation/v1/orgMapping/download"
+    strip_uri: true
+    plugins:
+      - name: jwt
+      - name: cors
+      - "{{ statsd_pulgin }}"
+      - name: acl
+        config.whitelist:
+          - 'dataAccess'
+      - name: rate-limiting
+        config.policy: local
+        config.hour: "{{ medium_rate_limit_per_hour }}"
+        config.limit_by: credential
+      - name: request-size-limiting
+        config.allowed_payload_size: "{{ small_request_size_limit }}"

From aec9041e3f6eff046731921537731b4a93ea8a1d Mon Sep 17 00:00:00 2001
From: Haritest <haridasksd@gmail.com>
Date: Thu, 19 Sep 2024 17:25:36 +0530
Subject: [PATCH 09/31] Update sb-cb-ext-service-env.j2 cbPoresService details
 added

---
 .../sb-cb-ext-service/files/sb-cb-ext-service-env.j2   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/kubernetes/helm_charts/igot-deploy/sb-cb-ext-service/files/sb-cb-ext-service-env.j2 b/kubernetes/helm_charts/igot-deploy/sb-cb-ext-service/files/sb-cb-ext-service-env.j2
index 4b781f7596..ef9d309ce5 100644
--- a/kubernetes/helm_charts/igot-deploy/sb-cb-ext-service/files/sb-cb-ext-service-env.j2
+++ b/kubernetes/helm_charts/igot-deploy/sb-cb-ext-service/files/sb-cb-ext-service-env.j2
@@ -438,3 +438,13 @@ competency.selected.version.facets.map={"competencies_v6":"competencies_v6.compe
 national.learning.insights.fields={{ national_learning_insights_fields }}
 national.learning.insights.property.fields={"valueColor": "#FFFFFF","labelColor": "#FFFFFF","linebreak":"false","background": "#1B4CA1","iconColor": "#FFFFFF"}
 national.learning.insights.redis.key.mapping={"Certificate Issued Yesterday":"dashboard_content_certificates_generated_yday_nlw_count","Total Certificate Issued So Far":"dashboard_content_certificates_generated_nlw_count","Events Published":"dashboard_events_published_nlw_count","Total Enrolments":"dashboard_content_enrolment_nlw_count"}
+
+#cbPoresService
+cb.pores.service.host=http://cb-pores-service:7001
+cb.pores.master.designation.endpoint=/designation/search
+sample.file.master.designation.workspace.name=Master
+Designationsample.bulk.upload.designation.file.name=bulkUploadDesignationMasterData.xlsx
+org.designation.bulk.upload.container.name=orgDesignation
+kafka.topics.org.designation.bulk.upload.event={{env}}.org.designation.bulk.upload
+kafka.topics.org.designation.bulk.upload.event.group=orgDesignationBulkUpload
+redis.master.data.read.timeout=3600

From c083b74b1c74917c482a5935faf69ad04e09ea75 Mon Sep 17 00:00:00 2001
From: Haritest <haridasksd@gmail.com>
Date: Mon, 23 Sep 2024 09:57:56 +0530
Subject: [PATCH 10/31] Update values.j2 spvorgID added for CBP

---
 kubernetes/helm_charts/igot-deploy/ui-cbp-igot/values.j2 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kubernetes/helm_charts/igot-deploy/ui-cbp-igot/values.j2 b/kubernetes/helm_charts/igot-deploy/ui-cbp-igot/values.j2
index 0cb2ccb4b2..124df616dc 100644
--- a/kubernetes/helm_charts/igot-deploy/ui-cbp-igot/values.j2
+++ b/kubernetes/helm_charts/igot-deploy/ui-cbp-igot/values.j2
@@ -1424,7 +1424,8 @@ envjson: |-
     "certImage": "assets/certimage/content",
     "timeForContentQuality": {{time_for_content_quality}},
     "compatibilityLevel": {{ compatibilitylevel | default("6")}},
-    "assessmentBuffer": 120
+    "assessmentBuffer": 120,
+    "spvorgID": "{{ spv_org_id }}"
  }
 
 serviceMonitor:

From f7ed7f9223946f817a8c5e41c2ea6476d703025e Mon Sep 17 00:00:00 2001
From: Haritest <haridasksd@gmail.com>
Date: Mon, 23 Sep 2024 17:14:01 +0530
Subject: [PATCH 11/31] Update values.j2 ml-template baseURL updated

---
 .../igot-deploy/ml-template-validation-portal/values.j2         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubernetes/helm_charts/igot-deploy/ml-template-validation-portal/values.j2 b/kubernetes/helm_charts/igot-deploy/ml-template-validation-portal/values.j2
index 3f8ad48f2d..bccad97b51 100644
--- a/kubernetes/helm_charts/igot-deploy/ml-template-validation-portal/values.j2
+++ b/kubernetes/helm_charts/igot-deploy/ml-template-validation-portal/values.j2
@@ -28,7 +28,7 @@ strategy:
 
 environmentjs: |-
   window["env"] = {
-      baseURL: 'http://ml-template-validation-backend-service:5000/template/api/v1/',
+      baseURL: 'https://{{domain_name}}/apis/proxies/v8',
       customAuth: true,
   };
 

From 27d86645feadc506c1612e39e2bc0ab0802d6596 Mon Sep 17 00:00:00 2001
From: pathiktarento1089 <123535830+pathiktarento1089@users.noreply.github.com>
Date: Mon, 23 Sep 2024 17:55:57 +0530
Subject: [PATCH 12/31] kong-config for ciosIntegration and contentPartner

---
 ansible/roles/kong-api/defaults/main.yml | 72 ++++++++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml
index 8f1165792c..d076cdaaf3 100644
--- a/ansible/roles/kong-api/defaults/main.yml
+++ b/ansible/roles/kong-api/defaults/main.yml
@@ -17864,3 +17864,75 @@ kong_apis:
         config.limit_by: credential
       - name: request-size-limiting
         config.allowed_payload_size: "{{ small_request_size_limit }}"
+        
+  - name: ciosReadContentByPartnercodeAndExternalid
+    uris: "{{ ciosIntegration_prefix }}/v1/read/content"
+    upstream_url: "{{ cios_content_service_url }}/ciosIntegration/v1/read/content"
+    strip_uri: true
+    plugins:
+      - name: jwt
+      - name: cors
+      - "{{ statsd_pulgin }}"
+      - name: acl
+        config.whitelist:
+          - 'contentAccess'
+      - name: rate-limiting
+        config.policy: local
+        config.hour: "{{ medium_rate_limit_per_hour }}"
+        config.limit_by: credential
+      - name: request-size-limiting
+        config.allowed_payload_size: "{{ medium_request_size_limit }}"  
+        
+  - name: ciosSearchContent
+    uris: "{{ ciosIntegration_prefix }}/v1/search/content"
+    upstream_url: "{{ cios_content_service_url }}/ciosIntegration/v1/search/content"
+    strip_uri: true
+    plugins:
+      - name: jwt
+      - name: cors
+      - "{{ statsd_pulgin }}"
+      - name: acl
+        config.whitelist:
+          - 'contentAccess'
+      - name: rate-limiting
+        config.policy: local
+        config.hour: "{{ medium_rate_limit_per_hour }}"
+        config.limit_by: credential
+      - name: request-size-limiting
+        config.allowed_payload_size: "{{ medium_request_size_limit }}"  
+
+  - name: ciosUpdateContent
+    uris: "{{ ciosIntegration_prefix }}/v1/update/content"
+    upstream_url: "{{ cios_content_service_url }}/ciosIntegration/v1/update/content"
+    strip_uri: true
+    plugins:
+      - name: jwt
+      - name: cors
+      - "{{ statsd_pulgin }}"
+      - name: acl
+        config.whitelist:
+          - 'contentAccess'
+      - name: rate-limiting
+        config.policy: local
+        config.hour: "{{ medium_rate_limit_per_hour }}"
+        config.limit_by: credential
+      - name: request-size-limiting
+        config.allowed_payload_size: "{{ medium_request_size_limit }}"  
+
+  - name: readbypartnercode
+    uris: "{{ contentpartner_prefix }}/v1/readbypartnercode"
+    upstream_url: "{{ cb_pores_service_url }}/contentpartner/v1/readbypartnercode"
+    strip_uri: true
+    plugins:
+      - name: jwt
+      - name: cors
+      - "{{ statsd_pulgin }}"
+      - name: acl
+        config.whitelist:
+          - 'contentUpdate'
+      - name: rate-limiting
+        config.policy: local
+        config.hour: "{{ medium_rate_limit_per_hour }}"
+        config.limit_by: credential
+      - name: request-size-limiting
+        config.allowed_payload_size: "{{ medium_request_size_limit }}"

From 26212a76a6111a5d757484eb4aa88dc81374dcb1 Mon Sep 17 00:00:00 2001
From: Haridas <haridas.kakunje@tarento.com>
Date: Tue, 24 Sep 2024 10:09:54 +0530
Subject: [PATCH 13/31] config updated for cios and cbpores

---
 .../cb-pores-service/files/cb-pores-service-env.j2       | 8 +++++++-
 .../files/cios-content-service-env.j2                    | 9 +++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/kubernetes/helm_charts/igot-deploy/cb-pores-service/files/cb-pores-service-env.j2 b/kubernetes/helm_charts/igot-deploy/cb-pores-service/files/cb-pores-service-env.j2
index cd598d1a72..f95a7c916e 100644
--- a/kubernetes/helm_charts/igot-deploy/cb-pores-service/files/cb-pores-service-env.j2
+++ b/kubernetes/helm_charts/igot-deploy/cb-pores-service/files/cb-pores-service-env.j2
@@ -98,4 +98,10 @@ odcs.designation.term.read=v1/framework/term/read
 framework.copy=v1/framework/copy
 framework.publish=v1/framework/publish
 kafka.topic.framework.create={{env}}.framework.create
-kafka.topic.framework.create.group=framework.create.group
\ No newline at end of file
+kafka.topic.framework.create.group=framework.create.group
+
+cios.content.service.host=http://cios-content-service:7001
+cios.content.service.update.api=/ciosIntegration/v1/update/content
+cios.content.service.search.api=/ciosIntegration/v1/search/content
+cornell.partner.code=CORNELL
+upgrad.partner.code=UPGRAD
\ No newline at end of file
diff --git a/kubernetes/helm_charts/igot-deploy/cios-content-service/files/cios-content-service-env.j2 b/kubernetes/helm_charts/igot-deploy/cios-content-service/files/cios-content-service-env.j2
index 9173d2f6bd..e84683fa2f 100644
--- a/kubernetes/helm_charts/igot-deploy/cios-content-service/files/cios-content-service-env.j2
+++ b/kubernetes/helm_charts/igot-deploy/cios-content-service/files/cios-content-service-env.j2
@@ -57,3 +57,12 @@ cios.read.api.base.url=http://cb-pores-service:7001
 cios.read.api.fixed.url=/cios/v1/content/readby/externalid/
 
 partner.read.path=/contentpartner/v1/readbypartnercode/
+
+elasticsearch.host={{ elasticsearch_host }}
+elasticsearch.port={{ elasticsearch_http_port }}
+elasticsearch.username={{ elasticsearch_username }}
+elasticsearch.password={{ elasticsearch_password }}
+elastic.required.field.cios.content.json.path=/EsFieldsMapping/esRequiredFieldsJsonFilePath.json
+search.result.redis.ttl=600
+cornell.partner.code=CORNELL
+upgrad.partner.code=UPGRAD
\ No newline at end of file

From a524fb3f1c5214553fe7914a8d4b057eee550c02 Mon Sep 17 00:00:00 2001
From: anilkumar <anilkumar.kammlapalli@tarento.com>
Date: Wed, 25 Sep 2024 12:56:57 +0530
Subject: [PATCH 14/31] added configuration for UserMigration

---
 ansible/roles/kong-api/defaults/main.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml
index 441d74c057..68f840c425 100644
--- a/ansible/roles/kong-api/defaults/main.yml
+++ b/ansible/roles/kong-api/defaults/main.yml
@@ -17556,3 +17556,21 @@ kong_apis:
         config.limit_by: credential
       - name: request-size-limiting
         config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: initiateUserMigration
+    uris: "/user/migration/initiate"
+    upstream_url: "{{ sb_cb_ext_service_url }}/user/migration/initiate"
+    strip_uri: true
+    plugins:
+      - name: jwt
+      - name: cors
+      - "{{ statsd_pulgin }}"
+      - name: acl
+        config.whitelist:
+          - 'dataAccess'
+      - name: rate-limiting
+        config.policy: local
+        config.hour: "{{ medium_rate_limit_per_hour }}"
+        config.limit_by: credential
+      - name: request-size-limiting
+        config.allowed_payload_size: "{{ medium_request_size_limit }}"

From c457618e4d4b407958822b10e07e098e4c871c88 Mon Sep 17 00:00:00 2001
From: Haritest <haridasksd@gmail.com>
Date: Wed, 25 Sep 2024 13:41:52 +0530
Subject: [PATCH 15/31] Update values.j2 for ml-template-validation-portal

---
 .../igot-deploy/ml-template-validation-portal/values.j2         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubernetes/helm_charts/igot-deploy/ml-template-validation-portal/values.j2 b/kubernetes/helm_charts/igot-deploy/ml-template-validation-portal/values.j2
index bccad97b51..dc70348da3 100644
--- a/kubernetes/helm_charts/igot-deploy/ml-template-validation-portal/values.j2
+++ b/kubernetes/helm_charts/igot-deploy/ml-template-validation-portal/values.j2
@@ -28,7 +28,7 @@ strategy:
 
 environmentjs: |-
   window["env"] = {
-      baseURL: 'https://{{domain_name}}/apis/proxies/v8',
+      baseUrl: 'https://{{domain_name}}/apis/proxies/v8/',
       customAuth: true,
   };
 

From 2091476b0f7ae92df9da56894be041714bd7b45f Mon Sep 17 00:00:00 2001
From: Haridas <haridas.kakunje@tarento.com>
Date: Wed, 25 Sep 2024 15:53:29 +0530
Subject: [PATCH 16/31] validation location added in nginx

---
 .../core/nginx-public-ingress/values.j2           | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/kubernetes/helm_charts/core/nginx-public-ingress/values.j2 b/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
index b1a1788d10..1469a86f69 100644
--- a/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
+++ b/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
@@ -655,6 +655,21 @@ proxyconfig: |-
      proxy_pass http://mentoring-portal:7601;
     }
 
+    location /validation/ {
+     proxy_set_header Host $host;
+     proxy_set_header X-Real-IP $remote_addr;
+     proxy_set_header X-Scheme $scheme;
+     proxy_connect_timeout 5;
+     proxy_send_timeout 60;
+     proxy_read_timeout 70;
+     proxy_set_header    X-Forwarded-Proto $scheme;
+     proxy_set_header Connection "";
+     proxy_http_version 1.1;
+     proxy_set_header X-Request-ID $sb_request_id;
+     rewrite ^/sup/(.*) /$1 break;
+     proxy_pass http://ml-template-validation-portal-service:3111;
+    }
+
     location ~ /api/ratings/v1/read {
       # Enabling caching
       proxy_cache_key "$request_uri";

From 50a0609f0acbb365d2ecdc83cd17b3981de9e02d Mon Sep 17 00:00:00 2001
From: Haridas <haridas.kakunje@tarento.com>
Date: Wed, 25 Sep 2024 15:55:57 +0530
Subject: [PATCH 17/31] validation location added in nginx

---
 kubernetes/helm_charts/core/nginx-public-ingress/values.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubernetes/helm_charts/core/nginx-public-ingress/values.j2 b/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
index 1469a86f69..2c7f390e88 100644
--- a/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
+++ b/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
@@ -666,7 +666,7 @@ proxyconfig: |-
      proxy_set_header Connection "";
      proxy_http_version 1.1;
      proxy_set_header X-Request-ID $sb_request_id;
-     rewrite ^/sup/(.*) /$1 break;
+     rewrite ^/validation/(.*) /$1 break;
      proxy_pass http://ml-template-validation-portal-service:3111;
     }
 

From 56c2f145192222cf0061bc593b92302521156132 Mon Sep 17 00:00:00 2001
From: root
 <root@kb-dev-jumphost-p1.asia-south1-c.c.prj-kb-nprd-dev-gcp-1004.internal>
Date: Thu, 26 Sep 2024 13:01:32 +0530
Subject: [PATCH 18/31] thumbnail-generation-service added

---
 .../thumbnail-generation-service/Chart.yaml   |  6 ++
 .../files/ansible_vars.yaml                   | 31 ++++++++
 .../files/thumbnail_generation.j2             | 14 ++++
 .../templates/configMap.yaml                  | 20 +++++
 .../templates/deployment.yaml                 | 73 +++++++++++++++++++
 .../templates/hpa.yaml                        | 27 +++++++
 .../thumbnail-generation-service/values.j2    | 48 ++++++++++++
 7 files changed, 219 insertions(+)
 create mode 100644 kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/Chart.yaml
 create mode 100644 kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/files/ansible_vars.yaml
 create mode 100644 kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/files/thumbnail_generation.j2
 create mode 100644 kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/templates/configMap.yaml
 create mode 100644 kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/templates/deployment.yaml
 create mode 100644 kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/templates/hpa.yaml
 create mode 100644 kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/values.j2

diff --git a/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/Chart.yaml b/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/Chart.yaml
new file mode 100644
index 0000000000..dfa0bc8128
--- /dev/null
+++ b/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: thumbnail-generation-service
+version: 0.1.0
+
diff --git a/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/files/ansible_vars.yaml b/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/files/ansible_vars.yaml
new file mode 100644
index 0000000000..896187b204
--- /dev/null
+++ b/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/files/ansible_vars.yaml
@@ -0,0 +1,31 @@
+---
+# vars file for deploy-vega-service
+# For script
+release_name: "{{ network_alias_thumbnail_generation_service }}"
+user_friendly_name: thumbnail_generation service
+#template_compose_file_name: ui-spv-igot.j2
+template_env_file_name: "thumbnail_generation.j2"
+compose_file_name: "{{ service_thumbnail_generation_service }}.yml"
+env_file_name: "{{ service_thumbnail_generation_service }}.env"
+helm_env_file_location: "../helm_charts/igot-deploy/templates/"
+helm_env_file_name: "{{ helm_env_file_location }}/{{ service_thumbnail_generation_service }}.env"
+
+
+env_file_deployment_location: "{{ env_files_dir }}/{{ env_file_name }}"
+compose_file_deployment_location: "{{ compose_files_dir }}/{{ compose_file_name }}"
+
+# For service
+application_port: "{{ service_thumbnail_generation_port }}"
+image_name: "{{ image_thumbnail_generation_service }}"
+tag: "{{ tags_thumbnail_generation_service }}"
+host_port: "{{ application_port }}"
+docker_port: "{{ application_port }}"
+replicas: "{{ service_replicas_thumbnail_generation_service }}"
+reserved_memory: "{{ service_mem_reserved_thumbnail_generation_service }}"
+limited_memory: "{{ service_mem_limit_thumbnail_generation_service }}"
+health_check_endpoint: http://127.0.0.1:{{ docker_port }}/healthcheck
+network_alias_name: "{{ network_alias_thumbnail_generation_service }}"
+docker_service_stack_name: ui
+docker_service_name: "{{ service_thumbnail_generation_service }}"
+force_reload: "{{ force_reload_thumbnail_generation_service }}"
+
diff --git a/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/files/thumbnail_generation.j2 b/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/files/thumbnail_generation.j2
new file mode 100644
index 0000000000..390fac8d72
--- /dev/null
+++ b/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/files/thumbnail_generation.j2
@@ -0,0 +1,14 @@
+SERVICE_ENVIRONMENT={{env}}
+LOG_LEVEL=INFO
+KB_API_HOST={{domain_name}}
+OPENAI_API_KEY={{thumbnail_generation_service_openai_api_key}}
+GCP_STORAGE_CREDENTIALS=gcp_storage_credentials.json
+GCP_BUCKET_NAME={{thumbnail_generation_bucket_name}}
+STORAGE_THUMBNAIL_FOLDER=thumbnail_images
+STORAGE_PROXY_PATH=/thumbnails/generated/
+GCP_GEMINI_CREDENTIALS=gcp_gemini_credentials.json
+GCP_GEMINI_PROJECT_ID=thumbnail_generation_gcp_gemini_project_id
+GEMINI_MODEL_PRO=thumbnail_generation_gemini_model_pro
+VISION_MODEL=thumbnail_generation_vision_model
+NUMBER_OF_IMAGES=2
+
diff --git a/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/templates/configMap.yaml b/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/templates/configMap.yaml
new file mode 100644
index 0000000000..aaa9a910a8
--- /dev/null
+++ b/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/templates/configMap.yaml
@@ -0,0 +1,20 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: gcp_storage_credentialsjson
+  namespace: {{ .Values.namespace }}
+data:
+  gcp_storage_credentials.json: |
+{{ .Values.gcp_storage_credentialsjson | indent 4 }}
+
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: gcp_gemini_credentialsjson
+  namespace: {{ .Values.namespace }}
+data:
+  gcp_gemini_credentials.json: |
+{{ .Values.gcp_gemini_credentialsjson | indent 4 }}
+
+---
diff --git a/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/templates/deployment.yaml b/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/templates/deployment.yaml
new file mode 100644
index 0000000000..1b5e53314b
--- /dev/null
+++ b/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/templates/deployment.yaml
@@ -0,0 +1,73 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ .Chart.Name }}
+  namespace: {{ .Values.namespace }}
+  annotations:
+    reloader.stakater.com/auto: "true"
+spec:
+  replicas: {{ .Values.replicaCount }}
+  strategy:
+     rollingUpdate:
+        maxSurge: {{ .Values.strategy.maxsurge }}
+        maxUnavailable: {{ .Values.strategy.maxunavailable }}
+  selector:
+    matchLabels:
+      app: {{ .Chart.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ .Chart.Name }}
+    spec:
+{{- if .Values.imagepullsecrets }}
+      imagePullSecrets:
+      - name: {{ .Values.imagepullsecrets }}
+{{- end }}
+      volumes:
+        - name: gcp_gemini_credentialsjson
+          configMap:
+            name: gcp_gemini_credentialsjson
+        - name: gcp_storage_credentialsjson
+          configMap:
+            name: gcp_storage_credentialsjson
+      containers:
+      - name: {{ .Chart.Name }}
+        image: "{{ .Values.dockerhub }}/{{ .Values.repository }}:{{ .Values.image_tag }}"
+        imagePullPolicy: Always
+        env:
+        - name: JAVA_OPTIONS
+          value: {{ .Values.env.javaoptions | quote }}
+        envFrom:
+        - configMapRef:
+            name: {{ .Chart.Name }}-config
+        resources:
+{{ toYaml .Values.resources | indent 10 }}
+        volumeMounts:
+        - name: gcp_gemini_credentialsjson
+          mountPath: /app/gcp_gemini_credentials.json
+          subPath: gcp_gemini_credentials.json
+        - name: gcp_storage_credentialsjson
+          mountPath: /app/gcp_storage_credentials.json
+          subPath: gcp_storage_credentials.json
+        ports:
+        - containerPort: {{ .Values.network.port }}
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Chart.Name }}
+  namespace: {{ .Values.namespace }}
+  labels:
+    app: {{ .Chart.Name }}
+spec:
+  ports:
+  - name: http-{{ .Chart.Name }}
+    protocol: TCP
+    port: {{ .Values.network.port }}
+    targetPort: {{ .Values.network.targetport }}
+
+  selector:
+    app: {{ .Chart.Name }}
+
diff --git a/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/templates/hpa.yaml b/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/templates/hpa.yaml
new file mode 100644
index 0000000000..b7cf788813
--- /dev/null
+++ b/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/templates/hpa.yaml
@@ -0,0 +1,27 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ .Chart.Name }}
+  namespace: {{ .Values.namespace }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ .Chart.Name }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/values.j2 b/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/values.j2
new file mode 100644
index 0000000000..e4260bbe69
--- /dev/null
+++ b/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/values.j2
@@ -0,0 +1,48 @@
+### Default variable file for thumbnail_generation-service ###
+
+namespace: {{ namespace }}
+imagepullsecrets: {{ imagepullsecrets }}
+dockerhub: {{ docker_hub_url }}
+
+
+env:
+  javaoptions: {{thumbnail_generation_java_mem_limit|default('-Xmx600m')}}
+
+replicaCount: {{thumbnail_generation_replicacount|default(1)}}
+repository: {{ image_thumbnail_generation_service }}
+image_tag: {{ image_tag }}
+resources:
+  requests:
+    cpu: {{thumbnail_generation_cpu_req|default('200m')}}
+    memory: {{thumbnail_generation_mem_req|default('200Mi')}}
+  limits:
+    cpu: {{thumbnail_generation_cpu_limit|default('500m')}}
+    memory: {{thumbnail_generation_mem_limit|default('800Mi')}}
+network:
+  port: {{ service_thumbnail_generation_port }}
+  targetport: {{ service_thumbnail_generation_port }}
+strategy:
+  type: RollingUpdate
+  maxsurge: {{ thumbnail_generation_maxsurge|default('25%') }}
+  maxunavailable: {{ thumbnail_generation_maxunavailable|default('25%') }}
+
+gcp_storage_credentialsjson: |-
+ {{gcp_artifcats_upload_service_account}}
+
+gcp_gemini_credentialsjson: |-
+ {{gcp_gemini_upload_service_account}}
+
+
+serviceMonitor:
+  enabled: true
+  labels: # labels with which the prometheus choose the serviceMonitor
+    app: prometheus-operator
+    release: prometheus-operator
+
+autoscaling:
+  enabled: {{ thumbnail_generation_autoscaling_enabled | default('false') }}
+  minReplicas: {{ thumbnail_generation_autoscaling_minReplicas|default(1) }}
+  maxReplicas: {{ thumbnail_generation_autoscaling_maxReplicas|default(2) }}
+  targetCPUUtilizationPercentage: {{ thumbnail_generation_autoscaling_targetCPUUtilizationPercentage|default(60) }}
+  targetMemoryUtilizationPercentage: {{ thumbnail_generation_autoscaling_targetMemoryUtilizationPercentage|default('') }}
+

From 9c8b36ef611317e48a40b8c2f5181f678135a89c Mon Sep 17 00:00:00 2001
From: root
 <root@kb-dev-jumphost-p1.asia-south1-c.c.prj-kb-nprd-dev-gcp-1004.internal>
Date: Thu, 26 Sep 2024 13:08:10 +0530
Subject: [PATCH 19/31] thumbnail-generation-service added

---
 .../files/thumbnail_generation.j2                           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/files/thumbnail_generation.j2 b/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/files/thumbnail_generation.j2
index 390fac8d72..48cbee02f2 100644
--- a/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/files/thumbnail_generation.j2
+++ b/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/files/thumbnail_generation.j2
@@ -7,8 +7,8 @@ GCP_BUCKET_NAME={{thumbnail_generation_bucket_name}}
 STORAGE_THUMBNAIL_FOLDER=thumbnail_images
 STORAGE_PROXY_PATH=/thumbnails/generated/
 GCP_GEMINI_CREDENTIALS=gcp_gemini_credentials.json
-GCP_GEMINI_PROJECT_ID=thumbnail_generation_gcp_gemini_project_id
-GEMINI_MODEL_PRO=thumbnail_generation_gemini_model_pro
-VISION_MODEL=thumbnail_generation_vision_model
+GCP_GEMINI_PROJECT_ID={{thumbnail_generation_gcp_gemini_project_id}}
+GEMINI_MODEL_PRO={{thumbnail_generation_gemini_model_pro}}
+VISION_MODEL={{thumbnail_generation_vision_model}}
 NUMBER_OF_IMAGES=2
 

From 285f9f97bd14aa97ac11fdd0c981b076f0dc256f Mon Sep 17 00:00:00 2001
From: root
 <root@kb-dev-jumphost-p1.asia-south1-c.c.prj-kb-nprd-dev-gcp-1004.internal>
Date: Thu, 26 Sep 2024 13:15:04 +0530
Subject: [PATCH 20/31] thumbnail-generation-service added

---
 ansible/inventory/env/group_vars/all.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ansible/inventory/env/group_vars/all.yml b/ansible/inventory/env/group_vars/all.yml
index f8b1739f28..c641733036 100644
--- a/ansible/inventory/env/group_vars/all.yml
+++ b/ansible/inventory/env/group_vars/all.yml
@@ -742,6 +742,7 @@ service_cb_integration_framework: cb-integration-framework
 service_ml_template_validation_portal_service: ml-template-validation-portal
 service_ml_template_validation_backend_service_service: ml-template-validation-backend-service
 service_cb_comment_service: cb-comment-service
+service_thumbnail_generation_service: thumbnail-generation-service
 
 # Ports
 service_bulk_upload_port: 3009
@@ -817,6 +818,7 @@ service_cb_integration_framework_port: 8091
 service_ml_template_validation_portal_port: 3111
 service_ml_template_validation_backend_service_port: 5000
 service_cb_comment_port: 8099
+service_thumbnail_generation_port: 8000
 
 # Network alias names, so that one service can talk to another
 network_alias_content_service: private-content-service
@@ -875,6 +877,7 @@ network_alias_cb_integration_framework: cb-integration-framework
 network_alias_ml_template_validation_portal_service: ml-template-validation-portal
 network_alias_ml_template_validation_backend_service_service: ml-template-validation-backend-service
 network_alias_cb_comment_service: cb-comment-service
+network_alias_thumbnail_generation_service:thumbnail-generation-service
 
 # Image names, this is used by the service alone, but since we want to have all the images in one place, we are oncfiguring the images here
 image_ui_static: ui-static
@@ -930,6 +933,7 @@ image_cb_service_registry_service: cb-service-registry
 image_ml_template_validation_portal_service: solution-upload-portal
 image_ml_template_validation_backend_service_service: ml-template-validation-backend-service
 image_cb_comment_service: cb-comment-service
+image_thumbnail_generation_service: thumbnail-generation-service
 
 #####################bulk-upload-spv#########
 host_bulk_upload: /mydata/bulk_upload

From a24b855e58e4fe27d6a20140d50fca62a7659036 Mon Sep 17 00:00:00 2001
From: root
 <root@kb-dev-jumphost-p1.asia-south1-c.c.prj-kb-nprd-dev-gcp-1004.internal>
Date: Thu, 26 Sep 2024 13:16:19 +0530
Subject: [PATCH 21/31] thumbnail-generation-service added

---
 ansible/inventory/env/group_vars/all.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/inventory/env/group_vars/all.yml b/ansible/inventory/env/group_vars/all.yml
index c641733036..2131f7fc15 100644
--- a/ansible/inventory/env/group_vars/all.yml
+++ b/ansible/inventory/env/group_vars/all.yml
@@ -877,7 +877,7 @@ network_alias_cb_integration_framework: cb-integration-framework
 network_alias_ml_template_validation_portal_service: ml-template-validation-portal
 network_alias_ml_template_validation_backend_service_service: ml-template-validation-backend-service
 network_alias_cb_comment_service: cb-comment-service
-network_alias_thumbnail_generation_service:thumbnail-generation-service
+network_alias_thumbnail_generation_service: thumbnail-generation-service
 
 # Image names, this is used by the service alone, but since we want to have all the images in one place, we are oncfiguring the images here
 image_ui_static: ui-static

From 29ffca0045f1cc656784e761ea7ab978feec44ac Mon Sep 17 00:00:00 2001
From: Haridas <haridas.kakunje@tarento.com>
Date: Thu, 26 Sep 2024 13:30:28 +0530
Subject: [PATCH 22/31] thumbnail-generation-service updated

---
 .../templates/configMap.yaml                         |  8 ++++----
 .../templates/deployment.yaml                        | 12 ++++++------
 .../thumbnail-generation-service/values.j2           |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/templates/configMap.yaml b/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/templates/configMap.yaml
index aaa9a910a8..360b134a8d 100644
--- a/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/templates/configMap.yaml
+++ b/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/templates/configMap.yaml
@@ -1,20 +1,20 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: gcp_storage_credentialsjson
+  name: gcpstoragecredentialsjson
   namespace: {{ .Values.namespace }}
 data:
   gcp_storage_credentials.json: |
-{{ .Values.gcp_storage_credentialsjson | indent 4 }}
+{{ .Values.gcpstoragecredentialsjson | indent 4 }}
 
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: gcp_gemini_credentialsjson
+  name: gcpgeminicredentialsjson
   namespace: {{ .Values.namespace }}
 data:
   gcp_gemini_credentials.json: |
-{{ .Values.gcp_gemini_credentialsjson | indent 4 }}
+{{ .Values.gcpgeminicredentialsjson | indent 4 }}
 
 ---
diff --git a/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/templates/deployment.yaml b/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/templates/deployment.yaml
index 1b5e53314b..147e81146c 100644
--- a/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/templates/deployment.yaml
+++ b/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/templates/deployment.yaml
@@ -25,12 +25,12 @@ spec:
       - name: {{ .Values.imagepullsecrets }}
 {{- end }}
       volumes:
-        - name: gcp_gemini_credentialsjson
+        - name: gcpgeminicredentialsjson
           configMap:
-            name: gcp_gemini_credentialsjson
-        - name: gcp_storage_credentialsjson
+            name: gcpgeminicredentialsjson
+        - name: gcpstoragecredentialsjson
           configMap:
-            name: gcp_storage_credentialsjson
+            name: gcpstoragecredentialsjson
       containers:
       - name: {{ .Chart.Name }}
         image: "{{ .Values.dockerhub }}/{{ .Values.repository }}:{{ .Values.image_tag }}"
@@ -44,10 +44,10 @@ spec:
         resources:
 {{ toYaml .Values.resources | indent 10 }}
         volumeMounts:
-        - name: gcp_gemini_credentialsjson
+        - name: gcpgeminicredentialsjson
           mountPath: /app/gcp_gemini_credentials.json
           subPath: gcp_gemini_credentials.json
-        - name: gcp_storage_credentialsjson
+        - name: gcpstoragecredentialsjson
           mountPath: /app/gcp_storage_credentials.json
           subPath: gcp_storage_credentials.json
         ports:
diff --git a/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/values.j2 b/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/values.j2
index e4260bbe69..fd2869f120 100644
--- a/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/values.j2
+++ b/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/values.j2
@@ -26,10 +26,10 @@ strategy:
   maxsurge: {{ thumbnail_generation_maxsurge|default('25%') }}
   maxunavailable: {{ thumbnail_generation_maxunavailable|default('25%') }}
 
-gcp_storage_credentialsjson: |-
+gcpstoragecredentialsjson: |-
  {{gcp_artifcats_upload_service_account}}
 
-gcp_gemini_credentialsjson: |-
+gcpgeminicredentialsjson: |-
  {{gcp_gemini_upload_service_account}}
 
 

From ea91778b36e84d0669c7103fde7f8a119db2ce98 Mon Sep 17 00:00:00 2001
From: Haridas <haridas.kakunje@tarento.com>
Date: Thu, 26 Sep 2024 14:12:06 +0530
Subject: [PATCH 23/31] thumbnail-generation-service updated

---
 .../files/thumbnail_generation.j2                  | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/files/thumbnail_generation.j2

diff --git a/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/files/thumbnail_generation.j2 b/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/files/thumbnail_generation.j2
deleted file mode 100644
index 48cbee02f2..0000000000
--- a/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/files/thumbnail_generation.j2
+++ /dev/null
@@ -1,14 +0,0 @@
-SERVICE_ENVIRONMENT={{env}}
-LOG_LEVEL=INFO
-KB_API_HOST={{domain_name}}
-OPENAI_API_KEY={{thumbnail_generation_service_openai_api_key}}
-GCP_STORAGE_CREDENTIALS=gcp_storage_credentials.json
-GCP_BUCKET_NAME={{thumbnail_generation_bucket_name}}
-STORAGE_THUMBNAIL_FOLDER=thumbnail_images
-STORAGE_PROXY_PATH=/thumbnails/generated/
-GCP_GEMINI_CREDENTIALS=gcp_gemini_credentials.json
-GCP_GEMINI_PROJECT_ID={{thumbnail_generation_gcp_gemini_project_id}}
-GEMINI_MODEL_PRO={{thumbnail_generation_gemini_model_pro}}
-VISION_MODEL={{thumbnail_generation_vision_model}}
-NUMBER_OF_IMAGES=2
-

From 6f8cb7037636fbfcfc21e5022fe0ce03a0570995 Mon Sep 17 00:00:00 2001
From: Haridas <haridas.kakunje@tarento.com>
Date: Thu, 26 Sep 2024 14:12:19 +0530
Subject: [PATCH 24/31] thumbnail-generation-service updated

---
 .../files/thumbnail_generation-env.j2              | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/files/thumbnail_generation-env.j2

diff --git a/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/files/thumbnail_generation-env.j2 b/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/files/thumbnail_generation-env.j2
new file mode 100644
index 0000000000..48cbee02f2
--- /dev/null
+++ b/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/files/thumbnail_generation-env.j2
@@ -0,0 +1,14 @@
+SERVICE_ENVIRONMENT={{env}}
+LOG_LEVEL=INFO
+KB_API_HOST={{domain_name}}
+OPENAI_API_KEY={{thumbnail_generation_service_openai_api_key}}
+GCP_STORAGE_CREDENTIALS=gcp_storage_credentials.json
+GCP_BUCKET_NAME={{thumbnail_generation_bucket_name}}
+STORAGE_THUMBNAIL_FOLDER=thumbnail_images
+STORAGE_PROXY_PATH=/thumbnails/generated/
+GCP_GEMINI_CREDENTIALS=gcp_gemini_credentials.json
+GCP_GEMINI_PROJECT_ID={{thumbnail_generation_gcp_gemini_project_id}}
+GEMINI_MODEL_PRO={{thumbnail_generation_gemini_model_pro}}
+VISION_MODEL={{thumbnail_generation_vision_model}}
+NUMBER_OF_IMAGES=2
+

From 0b9b22cc327c6fa315e84995994d4ec96e10c7a6 Mon Sep 17 00:00:00 2001
From: Haridas <haridas.kakunje@tarento.com>
Date: Thu, 26 Sep 2024 14:22:31 +0530
Subject: [PATCH 25/31] thumbnail-generation-service updated

---
 .../files/thumbnail_generation-env.j2                           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/files/thumbnail_generation-env.j2 b/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/files/thumbnail_generation-env.j2
index 48cbee02f2..99a2b98ffd 100644
--- a/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/files/thumbnail_generation-env.j2
+++ b/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/files/thumbnail_generation-env.j2
@@ -1,6 +1,6 @@
 SERVICE_ENVIRONMENT={{env}}
 LOG_LEVEL=INFO
-KB_API_HOST={{domain_name}}
+KB_API_HOST=https://{{domain_name}}
 OPENAI_API_KEY={{thumbnail_generation_service_openai_api_key}}
 GCP_STORAGE_CREDENTIALS=gcp_storage_credentials.json
 GCP_BUCKET_NAME={{thumbnail_generation_bucket_name}}

From dce5a255e244c6050e399733eaaa4140829b83b1 Mon Sep 17 00:00:00 2001
From: Haridas <haridas.kakunje@tarento.com>
Date: Thu, 26 Sep 2024 14:48:47 +0530
Subject: [PATCH 26/31] nginx updated with imagegen location

---
 .../core/nginx-public-ingress/values.j2            | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/kubernetes/helm_charts/core/nginx-public-ingress/values.j2 b/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
index 2c7f390e88..38ca3cc8ae 100644
--- a/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
+++ b/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
@@ -670,6 +670,20 @@ proxyconfig: |-
      proxy_pass http://ml-template-validation-portal-service:3111;
     }
 
+    location /imagegen/ {
+      proxy_cookie_path ~*^/.* /;
+      proxy_set_header X-Real-IP  $remote_addr;
+      proxy_set_header X-Forwarded-For $remote_addr;
+      proxy_set_header Host $host;
+      proxy_set_header X-Forwarded-Host $host;
+      proxy_set_header X-Forwarded-Server $host;
+      rewrite ^/imagegen/(.*) /$1 break;
+      proxy_pass http://thumbnail-generation-service:8000;
+      proxy_connect_timeout 10;
+      proxy_send_timeout 300;
+      proxy_read_timeout 300;
+    }
+
     location ~ /api/ratings/v1/read {
       # Enabling caching
       proxy_cache_key "$request_uri";

From 2a68c0bc5739813277836bd917eec2f510c484e6 Mon Sep 17 00:00:00 2001
From: Haridas <haridas.kakunje@tarento.com>
Date: Fri, 27 Sep 2024 10:35:27 +0530
Subject: [PATCH 27/31] cb-ext config updated

---
 .../sb-cb-ext-service/files/sb-cb-ext-service-env.j2          | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/kubernetes/helm_charts/igot-deploy/sb-cb-ext-service/files/sb-cb-ext-service-env.j2 b/kubernetes/helm_charts/igot-deploy/sb-cb-ext-service/files/sb-cb-ext-service-env.j2
index ef9d309ce5..c931a28091 100644
--- a/kubernetes/helm_charts/igot-deploy/sb-cb-ext-service/files/sb-cb-ext-service-env.j2
+++ b/kubernetes/helm_charts/igot-deploy/sb-cb-ext-service/files/sb-cb-ext-service-env.j2
@@ -448,3 +448,7 @@ org.designation.bulk.upload.container.name=orgDesignation
 kafka.topics.org.designation.bulk.upload.event={{env}}.org.designation.bulk.upload
 kafka.topics.org.designation.bulk.upload.event.group=orgDesignationBulkUpload
 redis.master.data.read.timeout=3600
+
+
+kafka.topics.cqf.assessment.postpublish={{env}}.questionset.postpublish
+kafka.groupId.cqf.assessment.postpublish={{env}}-questionset-publish-group

From 6fb0e61896e04c4d6b8de2a20532637259c3c01a Mon Sep 17 00:00:00 2001
From: Haridas <haridas.kakunje@tarento.com>
Date: Fri, 27 Sep 2024 11:03:54 +0530
Subject: [PATCH 28/31] nginx validation location added in spv

---
 .../core/nginx-public-ingress/values.j2           | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/kubernetes/helm_charts/core/nginx-public-ingress/values.j2 b/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
index 38ca3cc8ae..ac7a0c4d61 100644
--- a/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
+++ b/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
@@ -4037,6 +4037,21 @@ proxyconfig: |-
       proxy_set_header X-Request-ID $sb_request_id;
       proxy_pass http://ui-spv-igot;
     }
+
+    location /validation/ {
+      proxy_set_header Host $host;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Scheme $scheme;
+      proxy_connect_timeout 5;
+      proxy_send_timeout 60;
+      proxy_read_timeout 70;
+      proxy_set_header    X-Forwarded-Proto $scheme;
+      proxy_set_header Connection "";
+      proxy_http_version 1.1;
+      proxy_set_header X-Request-ID $sb_request_id;
+      rewrite ^/validation/(.*) /$1 break;
+      proxy_pass http://ml-template-validation-portal-service:3111;
+    }
     location /v3/device/register {
       proxy_set_header X-Request-ID $sb_request_id;
       proxy_pass http://kong;

From 3c569792469fa01c7da544f84d49403b254afe4c Mon Sep 17 00:00:00 2001
From: Haridas <haridas.kakunje@tarento.com>
Date: Fri, 27 Sep 2024 11:09:15 +0530
Subject: [PATCH 29/31] ml_template_validation_portal variable updated

---
 .../igot-deploy/ml-template-validation-portal/values.j2         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubernetes/helm_charts/igot-deploy/ml-template-validation-portal/values.j2 b/kubernetes/helm_charts/igot-deploy/ml-template-validation-portal/values.j2
index dc70348da3..13cfd29d3a 100644
--- a/kubernetes/helm_charts/igot-deploy/ml-template-validation-portal/values.j2
+++ b/kubernetes/helm_charts/igot-deploy/ml-template-validation-portal/values.j2
@@ -28,7 +28,7 @@ strategy:
 
 environmentjs: |-
   window["env"] = {
-      baseUrl: 'https://{{domain_name}}/apis/proxies/v8/',
+      baseUrl: 'https://spv.{{static_domain_name}}/apis/proxies/v8/',
       customAuth: true,
   };
 

From a79720a19d546a67c390c25183e44de42d0f9ee3 Mon Sep 17 00:00:00 2001
From: Haridas <haridas.kakunje@tarento.com>
Date: Fri, 27 Sep 2024 11:11:47 +0530
Subject: [PATCH 30/31] ml_template_validation_portal variable updated

---
 .../igot-deploy/ml-template-validation-portal/values.j2         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubernetes/helm_charts/igot-deploy/ml-template-validation-portal/values.j2 b/kubernetes/helm_charts/igot-deploy/ml-template-validation-portal/values.j2
index 13cfd29d3a..b70d4178f7 100644
--- a/kubernetes/helm_charts/igot-deploy/ml-template-validation-portal/values.j2
+++ b/kubernetes/helm_charts/igot-deploy/ml-template-validation-portal/values.j2
@@ -28,7 +28,7 @@ strategy:
 
 environmentjs: |-
   window["env"] = {
-      baseUrl: 'https://spv.{{static_domain_name}}/apis/proxies/v8/',
+      baseUrl: 'https://spv.{{nginx_proxy_server_name}}/apis/proxies/v8/',
       customAuth: true,
   };
 

From 53b1ca8abfd87649a33878171484dcae96c936d2 Mon Sep 17 00:00:00 2001
From: Haridas <haridas.kakunje@tarento.com>
Date: Fri, 27 Sep 2024 14:11:28 +0530
Subject: [PATCH 31/31] ml_template_validation_portal reverted changes

---
 .../igot-deploy/ml-template-validation-portal/values.j2         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubernetes/helm_charts/igot-deploy/ml-template-validation-portal/values.j2 b/kubernetes/helm_charts/igot-deploy/ml-template-validation-portal/values.j2
index b70d4178f7..dc70348da3 100644
--- a/kubernetes/helm_charts/igot-deploy/ml-template-validation-portal/values.j2
+++ b/kubernetes/helm_charts/igot-deploy/ml-template-validation-portal/values.j2
@@ -28,7 +28,7 @@ strategy:
 
 environmentjs: |-
   window["env"] = {
-      baseUrl: 'https://spv.{{nginx_proxy_server_name}}/apis/proxies/v8/',
+      baseUrl: 'https://{{domain_name}}/apis/proxies/v8/',
       customAuth: true,
   };