From 99db502d09c375528f3d10e61e6888301326bdb7 Mon Sep 17 00:00:00 2001 From: shankaragoudab <140387294+shankaragoudab@users.noreply.github.com> Date: Tue, 3 Dec 2024 12:20:16 +0530 Subject: [PATCH 01/14] changes for org read api to public access --- ansible/roles/kong-api/defaults/main.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml index ba36915694..5fbaf5eb88 100644 --- a/ansible/roles/kong-api/defaults/main.yml +++ b/ansible/roles/kong-api/defaults/main.yml @@ -3129,12 +3129,8 @@ kong_apis: upstream_url: "{{ learning_service_url }}/v1/org/read" strip_uri: true plugins: - - name: jwt - name: cors - "{{ statsd_pulgin }}" - - name: acl - config.whitelist: - - 'orgAccess' - name: rate-limiting config.policy: local config.hour: "{{ medium_rate_limit_per_hour }}" From 0fabe026a0d80f021ad1e551859f501ba4630bb8 Mon Sep 17 00:00:00 2001 From: Haridas Date: Wed, 4 Dec 2024 21:58:01 +0530 Subject: [PATCH 02/14] hpa config added for public assessmt service --- .../templates/hpa.yaml | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 kubernetes/helm_charts/igot-deploy/public-assessment-service/templates/hpa.yaml diff --git a/kubernetes/helm_charts/igot-deploy/public-assessment-service/templates/hpa.yaml b/kubernetes/helm_charts/igot-deploy/public-assessment-service/templates/hpa.yaml new file mode 100644 index 0000000000..fd75ba3280 --- /dev/null +++ b/kubernetes/helm_charts/igot-deploy/public-assessment-service/templates/hpa.yaml @@ -0,0 +1,31 @@ +{{- if .Values.autoscaling.enabled }} +apiVersion: autoscaling/v2 +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 + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + {{- end }} + {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} + - type: Resource + resource: + name: memory + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + {{- end }} +{{- end }} \ No newline at end of file From 0212b1aeb33b902e4f5f31a9db6afe0516628050 Mon Sep 17 00:00:00 2001 From: Arpitha Date: Thu, 5 Dec 2024 13:22:22 +0530 Subject: [PATCH 03/14] EnrollmentProgressApi added --- ansible/roles/kong-api/defaults/main.yml | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml index 94195caebc..9ae1fcf7e6 100644 --- a/ansible/roles/kong-api/defaults/main.yml +++ b/ansible/roles/kong-api/defaults/main.yml @@ -18712,4 +18712,24 @@ kong_apis: config.hour: "{{ medium_rate_limit_per_hour }}" config.limit_by: credential - name: request-size-limiting - config.allowed_payload_size: "{{ medium_request_size_limit }}" + config.allowed_payload_size: "{{ medium_request_size_limit }}" + + - name: ciosEnrollProgressUpdate + uris: "{{ external_enrollment_prefix }}/v1/user/progressupdate" + upstream_url: "{{ cb_external_enrollment_service_url }}/cios-enroll/v1/user/progressupdate" + strip_uri: true + plugins: + - name: jwt + - name: cors + - "{{ statsd_pulgin }}" + - name: acl + config.whitelist: + - 'dataAccess' + - 'contentPartner' + - 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 186a45a68686d9c8c0c50206977ec5df6c7c06a8 Mon Sep 17 00:00:00 2001 From: Haritest Date: Thu, 5 Dec 2024 14:11:29 +0530 Subject: [PATCH 04/14] Update main.yml duplicate removed --- ansible/roles/kong-api/defaults/main.yml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml index 9ae1fcf7e6..45720aad4f 100644 --- a/ansible/roles/kong-api/defaults/main.yml +++ b/ansible/roles/kong-api/defaults/main.yml @@ -18714,22 +18714,3 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" - - name: ciosEnrollProgressUpdate - uris: "{{ external_enrollment_prefix }}/v1/user/progressupdate" - upstream_url: "{{ cb_external_enrollment_service_url }}/cios-enroll/v1/user/progressupdate" - strip_uri: true - plugins: - - name: jwt - - name: cors - - "{{ statsd_pulgin }}" - - name: acl - config.whitelist: - - 'dataAccess' - - 'contentPartner' - - 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 7c2bbd22f46cd7bb5a654bb0cd73ccf4d2bc1847 Mon Sep 17 00:00:00 2001 From: sreerag-tarento Date: Fri, 13 Dec 2024 10:54:02 +0530 Subject: [PATCH 05/14] Redirectling private user update API to cb-ext admin update - KB-7703 --- 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 76a4717885..ccfb9ae252 100644 --- a/ansible/roles/kong-api/defaults/main.yml +++ b/ansible/roles/kong-api/defaults/main.yml @@ -2702,6 +2702,24 @@ kong_apis: - name: privateUserUpdate uris: "{{ user_service_prefix }}/private/v1/update" + upstream_url: "{{ sb_cb_ext_service_url }}/user/admin/patch" + strip_uri: true + plugins: + - name: jwt + - name: cors + - "{{ statsd_pulgin }}" + - name: acl + config.whitelist: + - 'dataCreate' + - 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 }}" + + - name: privateUserAdminUpdate + uris: "{{ user_service_prefix }}/private/v1/admin/update" upstream_url: "{{ learning_service_url }}/private/user/v1/update" strip_uri: true plugins: From 11e36a3784229b2e9ce8f00cefa9e4b243be5012 Mon Sep 17 00:00:00 2001 From: pathiktarento1089 <123535830+pathiktarento1089@users.noreply.github.com> Date: Fri, 13 Dec 2024 11:45:07 +0530 Subject: [PATCH 06/14] kong config for recommendation Course by designation --- 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 ef96497b2e..067db68c9c 100644 --- a/ansible/roles/kong-api/defaults/main.yml +++ b/ansible/roles/kong-api/defaults/main.yml @@ -18851,3 +18851,21 @@ kong_apis: config.limit_by: credential - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" + + - name: recommendationCourseByDesignation + uris: "/v1/recommendations/courses" + upstream_url: "{{ sb_cb_ext_service_url }}/v1/recommendations/courses" + 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 84cf1eefea010c7cd0f44a555e629b420016e728 Mon Sep 17 00:00:00 2001 From: Haritest Date: Fri, 13 Dec 2024 12:11:59 +0530 Subject: [PATCH 07/14] Update sunbird_lms-service.env ES config updated --- .../roles/stack-sunbird/templates/sunbird_lms-service.env | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/roles/stack-sunbird/templates/sunbird_lms-service.env b/ansible/roles/stack-sunbird/templates/sunbird_lms-service.env index 5a32c0d6f2..6a5f805c9a 100644 --- a/ansible/roles/stack-sunbird/templates/sunbird_lms-service.env +++ b/ansible/roles/stack-sunbird/templates/sunbird_lms-service.env @@ -5,8 +5,8 @@ sunbird_sso_username={{sunbird_sso_username}} sunbird_sso_password={{sunbird_sso_password}} sunbird_sso_client_id={{sunbird_sso_client_id}} sunbird_sso_client_secret={{sunbird_sso_client_secret | d('')}} -sunbird_es_host={{sunbird_es_host}} -sunbird_es_port={{sunbird_es_port}} +sunbird_es_host={{groups['es']|join(',')}} +sunbird_es_port=9300,9300,9300 sunbird_cassandra_username=cassandra sunbird_cassandra_password=password actor_hostname=actor-service @@ -186,4 +186,4 @@ ekstep_content_search_url=/v4/search karmayogi_saptah_end_date={{karmayogi_saptah_end_date}} -use_cache_for_enrollment_list_batch_fetch={{ use_cache_for_enrollment_list_batch_fetch | default('true') }} \ No newline at end of file +use_cache_for_enrollment_list_batch_fetch={{ use_cache_for_enrollment_list_batch_fetch | default('true') }} From 78b70a5a8ecc1303217a52c7643a4390a6ae1ebb Mon Sep 17 00:00:00 2001 From: Haridas Date: Fri, 13 Dec 2024 13:07:41 +0530 Subject: [PATCH 08/14] cb-ext config updated --- .../igot-deploy/sb-cb-ext-service/files/sb-cb-ext-service-env.j2 | 1 + 1 file changed, 1 insertion(+) 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 5b271db83f..c16d4ee119 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 @@ -503,4 +503,5 @@ qr.custom.self.registration.upload.path=https://{{domain_name}}/content-store/cu img.store.path=/tmp/imgFiles qr.custom.self.registration.skip.validation=false qr.custom.self.registration.logoupload.path=https://{{domain_name}}/content-store/customselfregistration-logo/ +course.recommendation.designation.redis.key=odcs_course_recomendation From bf1ab894e1c6a75dabbe29f854574808b42a666a Mon Sep 17 00:00:00 2001 From: sreerag-tarento Date: Fri, 13 Dec 2024 15:18:48 +0530 Subject: [PATCH 09/14] Review Changes --- ansible/roles/kong-api/defaults/main.yml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml index ccfb9ae252..8c4715f909 100644 --- a/ansible/roles/kong-api/defaults/main.yml +++ b/ansible/roles/kong-api/defaults/main.yml @@ -2718,24 +2718,6 @@ kong_apis: - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" - - name: privateUserAdminUpdate - uris: "{{ user_service_prefix }}/private/v1/admin/update" - upstream_url: "{{ learning_service_url }}/private/user/v1/update" - strip_uri: true - plugins: - - name: jwt - - name: cors - - "{{ statsd_pulgin }}" - - name: acl - config.whitelist: - - 'dataCreate' - - 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 }}" - - name: profileVisibility uris: "{{ user_service_prefix }}/v1/profile/visibility" upstream_url: "{{ learning_service_url }}/v1/user/profile/visibility" From 6b871f8cc63ca6309adab5c259a1252970e0a5e6 Mon Sep 17 00:00:00 2001 From: pathiktarento1089 <123535830+pathiktarento1089@users.noreply.github.com> Date: Fri, 13 Dec 2024 15:30:00 +0530 Subject: [PATCH 10/14] Updated endPoint for remommendation coures --- ansible/roles/kong-api/defaults/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml index 067db68c9c..e3248cba9a 100644 --- a/ansible/roles/kong-api/defaults/main.yml +++ b/ansible/roles/kong-api/defaults/main.yml @@ -18853,8 +18853,8 @@ kong_apis: config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: recommendationCourseByDesignation - uris: "/v1/recommendations/courses" - upstream_url: "{{ sb_cb_ext_service_url }}/v1/recommendations/courses" + uris: "/recommendations/v1/courses" + upstream_url: "{{ sb_cb_ext_service_url }}/recommendations/v1/courses" strip_uri: true plugins: - name: jwt From 34c0199dc7f4b1743336624f5dfe3175804322ba Mon Sep 17 00:00:00 2001 From: Haritest Date: Fri, 13 Dec 2024 16:03:18 +0530 Subject: [PATCH 11/14] Update cb-comment-service-env.j2 Redis variable upadted --- .../cb-comment-service/files/cb-comment-service-env.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/helm_charts/igot-deploy/cb-comment-service/files/cb-comment-service-env.j2 b/kubernetes/helm_charts/igot-deploy/cb-comment-service/files/cb-comment-service-env.j2 index 397e37dc28..642ae27a14 100644 --- a/kubernetes/helm_charts/igot-deploy/cb-comment-service/files/cb-comment-service-env.j2 +++ b/kubernetes/helm_charts/igot-deploy/cb-comment-service/files/cb-comment-service-env.j2 @@ -17,7 +17,7 @@ spring.jpa.hibernate.ddl-auto=update jwt.secret.key={{comment_hub_jwt_secret_key}} #----------------------------------Redis ----------------------------- -spring.redis.host={{ kp_redis_ip }} +spring.redis.host={{ redis_host }} spring.redis.port=6379 redis.ttl=300 From 3845cce93d1d322fbbf81a65709f5deae104fbe0 Mon Sep 17 00:00:00 2001 From: sreerag-tarento Date: Fri, 13 Dec 2024 16:15:01 +0530 Subject: [PATCH 12/14] Reverting private update API chnages --- 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 8c4715f909..76a4717885 100644 --- a/ansible/roles/kong-api/defaults/main.yml +++ b/ansible/roles/kong-api/defaults/main.yml @@ -2702,7 +2702,7 @@ kong_apis: - name: privateUserUpdate uris: "{{ user_service_prefix }}/private/v1/update" - upstream_url: "{{ sb_cb_ext_service_url }}/user/admin/patch" + upstream_url: "{{ learning_service_url }}/private/user/v1/update" strip_uri: true plugins: - name: jwt From a701d44d636e033eb1595f2eacf76a7324f550cb Mon Sep 17 00:00:00 2001 From: Haritest Date: Mon, 16 Dec 2024 17:02:51 +0530 Subject: [PATCH 13/14] Update main.yml OperationalReportDownload kong updated --- ansible/roles/kong-api/defaults/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml index 45720aad4f..cc406e811a 100644 --- a/ansible/roles/kong-api/defaults/main.yml +++ b/ansible/roles/kong-api/defaults/main.yml @@ -12546,6 +12546,7 @@ kong_apis: - name: acl config.whitelist: - 'dataAccess' + - 'storageReportDownload' - name: rate-limiting config.policy: local config.hour: "{{ medium_rate_limit_per_hour }}" From 47bdcbe0da5fcca403cac9152d957796ffe24f29 Mon Sep 17 00:00:00 2001 From: shankaragoudab <140387294+shankaragoudab@users.noreply.github.com> Date: Mon, 16 Dec 2024 17:05:06 +0530 Subject: [PATCH 14/14] recomendation api end point modified to courseRecommend 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 46e20c1788..395d5fa97b 100644 --- a/ansible/roles/kong-api/defaults/main.yml +++ b/ansible/roles/kong-api/defaults/main.yml @@ -18853,7 +18853,7 @@ kong_apis: config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: recommendationCourseByDesignation - uris: "/recommendations/v1/courses" + uris: "/courseRecommend/v1/courses" upstream_url: "{{ sb_cb_ext_service_url }}/recommendations/v1/courses" strip_uri: true plugins: