diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml index aec14f9bd5..ba208a9944 100644 --- a/ansible/roles/kong-api/defaults/main.yml +++ b/ansible/roles/kong-api/defaults/main.yml @@ -12544,6 +12544,7 @@ kong_apis: - name: acl config.whitelist: - 'dataAccess' + - 'storageReportDownload' - name: rate-limiting config.policy: local config.hour: "{{ medium_rate_limit_per_hour }}" @@ -18710,7 +18711,7 @@ 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: uploadLogoToGcpContainer uris: "/customselfregistration/upload/logo/gcpcontainer" @@ -18850,8 +18851,26 @@ 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: recommendationCourseByDesignation + uris: "/courseRecommend/v1/courses" + upstream_url: "{{ sb_cb_ext_service_url }}/recommendations/v1/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 }}" + - name: reportDiscussion uris: "{{ discussionfeed_prefix }}/report" upstream_url: "{{ cb_discussion_service_url }}/discussion/report" @@ -18868,4 +18887,4 @@ 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 }}" \ No newline at end of file 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') }} 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 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 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