Merge pull request #3261 from project-sunbird/release-4.7.0

Merge 4.7.0 to 4.8.0

ansible/roles/stack-sunbird/templates/uci_api.env

@@ -8,7 +8,7 @@ HASURA_GRAPHQL_ENABLED_LOG_TYPES=startup, http-log, webhook-log, websocket-log,
 HASURA_GRAPHQL_ENABLE_CONSOLE=true
 
 #Kafka
-KAFKA_HOST={{kafka_broker_host}}
+KAFKA_HOST={{sunbird_processing_kafka_host}}
 KAFKA_PASS=""
 KAFKA_PORT=9092
 KAFKA_USER=""

kubernetes/ansible/roles/sunbird-monitoring/templates/additional-scrape-configs.yaml

@@ -47,7 +47,7 @@ scrapeconfig:
   - job_name: 'process-exporter'
     metrics_path: /metrics
     static_configs:
-      - targets: ["{{ groups['process-exporter'] | difference(["localhost"]) | map('regex_replace', '^(.*)$', '\\1:1111' ) | list | join("\", \"") }}"]
+      - targets: ["{{ groups['process-exporter'] | difference(["localhost"]) | map('regex_replace', '^(.*)$', '\\1:9256' ) | list | join("\", \"") }}"]
 
   - job_name: 'cassandra-exporter'
     metrics_path: /metrics

kubernetes/helm_charts/core/gotenberg/templates/hpa.yaml

+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+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

kubernetes/helm_charts/core/gotenberg/values.j2

@@ -23,5 +23,10 @@ strategy:
   maxsurge: {{ gotenberg_maxsurge|default('25%') }}
   maxunavailable: {{ gotenberg_maxunavailable|default('25%') }}
   
-
+autoscaling:
+  enabled: {{ gotenberg_autoscaling_enabled | default('false') }}
+  minReplicas: {{ gotenberg_autoscaling_minReplicas|default(1) }}
+  maxReplicas: {{ gotenberg_autoscaling_maxReplicas|default(2) }}
+  targetCPUUtilizationPercentage: {{ gotenberg_autoscaling_targetCPUUtilizationPercentage|default(60) }}
+  targetMemoryUtilizationPercentage: {{ gotenberg_autoscaling_targetMemoryUtilizationPercentage|default('') }}
 

kubernetes/helm_charts/core/ml-core-service/templates/hpa.yaml

+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+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

kubernetes/helm_charts/core/ml-core-service/values.j2

@@ -25,3 +25,9 @@ strategy:
 {{ ml_core_liveness_readiness | to_nice_yaml }}
 ml_core_access_basepath: {{ ml_core_access_basepath | default('/opt/core/keycloak-public-keys/') }}
 
+autoscaling:
+  enabled: {{ ml_core_autoscaling_enabled | default('false') }}
+  minReplicas: {{ ml_core_autoscaling_minReplicas|default(1) }}
+  maxReplicas: {{ ml_core_autoscaling_maxReplicas|default(2) }}
+  targetCPUUtilizationPercentage: {{ ml_core_autoscaling_targetCPUUtilizationPercentage|default(60) }}
+  targetMemoryUtilizationPercentage: {{ ml_core_autoscaling_targetMemoryUtilizationPercentage|default('') }}
\ No newline at end of file

kubernetes/helm_charts/core/ml-projects-service/templates/hpa.yaml

+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+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

kubernetes/helm_charts/core/ml-projects-service/values.j2

@@ -24,3 +24,10 @@ strategy:
   
 {{ ml_projects_liveness_readiness | to_nice_yaml }}
 ml_projects_access_basepath : {{ ml_projects_access_basepath | default('/opt/projects/keycloak-public-keys/') }}
+
+autoscaling:
+  enabled: {{ ml_projects_autoscaling_enabled | default('false') }}
+  minReplicas: {{ ml_projects_autoscaling_minReplicas|default(1) }}
+  maxReplicas: {{ ml_projects_autoscaling_maxReplicas|default(2) }}
+  targetCPUUtilizationPercentage: {{ ml_projects_autoscaling_targetCPUUtilizationPercentage|default(60) }}
+  targetMemoryUtilizationPercentage: {{ ml_projects_autoscaling_targetMemoryUtilizationPercentage|default('') }}
\ No newline at end of file

kubernetes/helm_charts/core/ml-reports-service/templates/hpa.yaml

+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+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

kubernetes/helm_charts/core/ml-reports-service/values.j2

@@ -26,3 +26,9 @@ strategy:
 {{ ml_reports_liveness_readiness | to_nice_yaml }}
 ml_reports_access_basepath: {{ ml_reports_access_basepath | default('/opt/reports/keycloak-public-keys/') }}
 
+autoscaling:
+  enabled: {{ ml_reports_autoscaling_enabled | default('false') }}
+  minReplicas: {{ ml_reports_autoscaling_minReplicas|default(1) }}
+  maxReplicas: {{ ml_reports_autoscaling_maxReplicas|default(2) }}
+  targetCPUUtilizationPercentage: {{ ml_reports_autoscaling_targetCPUUtilizationPercentage|default(60) }}
+  targetMemoryUtilizationPercentage: {{ ml_reports_autoscaling_targetMemoryUtilizationPercentage|default('') }}

kubernetes/helm_charts/core/ml-survey-service/templates/hpa.yaml

+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+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

kubernetes/helm_charts/core/ml-survey-service/values.j2

@@ -25,4 +25,10 @@ strategy:
 {{ ml_survey_liveness_readiness | to_nice_yaml }}
 ml_survey_access_basepath: {{ ml_survey_access_basepath | default('/opt/survey/keycloak-public-keys/') }}
 
+autoscaling:
+  enabled: {{ ml_survey_autoscaling_enabled | default('false') }}
+  minReplicas: {{ ml_survey_autoscaling_minReplicas|default(1) }}
+  maxReplicas: {{ ml_survey_autoscaling_maxReplicas|default(2) }}
+  targetCPUUtilizationPercentage: {{ ml_survey_autoscaling_targetCPUUtilizationPercentage|default(60) }}
+  targetMemoryUtilizationPercentage: {{ ml_survey_autoscaling_targetMemoryUtilizationPercentage|default('') }}