Added hpa configuration for core-services and metrics (#2157)

egovernments · Dec 6, 2023 · 046be21 · 046be21
1 parent 8d0c5b9
commit 046be21
Show file tree

Hide file tree

Showing 105 changed files with 502 additions and 150 deletions.
diff --git a/deploy-as-code/helm/charts/backbone-services/kafka-kraft/values.yaml b/deploy-as-code/helm/charts/backbone-services/kafka-kraft/values.yaml
@@ -568,8 +568,8 @@ controller:
   ## @param controller.resources.requests The requested resources for the container
   ##
   resources:
-    limits: {}
-    requests: {}
+    limits: 2Gi
+    requests: 1.5Gi
   ## Kafka pods' Security Context
   ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
   ## @param controller.podSecurityContext.enabled Enable security context for the pods

diff --git a/deploy-as-code/helm/charts/common/templates/_hpa.yaml b/deploy-as-code/helm/charts/common/templates/_hpa.yaml
@@ -0,0 +1,30 @@
+{{- define "common.hpa" -}}
+{{- if .Values.hpa.enabled -}}
+---
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ template "common.name" . }}
+  namespace: {{ .Values.namespace }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ template "common.name" . }}
+  minReplicas: 1
+  maxReplicas: 1
+  metrics:
+  - type: Resource
+    resource:
+      name: cpu
+      target:
+        type: Utilization
+        averageUtilization: 90
+  - type: Resource
+    resource:
+      name: memory
+      target:
+        type: Utilization
+        averageValue: 90
+{{- end -}}
+{{- end -}}
diff --git a/deploy-as-code/helm/charts/common/values.yaml b/deploy-as-code/helm/charts/common/values.yaml
@@ -109,14 +109,22 @@ lifecycle:
             - -c
             - "sleep 10"
 
-memory_limits: "256Mi"
+memory_limits: "512Mi"
+memory_requests: "256Mi"
+cpu_limits: "50m"
+cpu_requests: "10m"
 resources: |
   {{- if eq .Values.appType "java-spring" -}}
   requests:
-    memory: {{ .Values.memory_limits | quote }}
+    cpu: {{ .Values.cpu_requests | quote }}
+    memory: {{ .Values.memory_requests | quote }}
   limits:
+    cpu: {{ .Values.cpu_limits | quote }}
     memory: {{ .Values.memory_limits | quote }}
   {{- end -}}
+
+hpa:
+  enabled: true
 ## Allows specification of additional environment variables
 extraEnv:
   java: |

diff --git a/deploy-as-code/helm/charts/core-services/audit-service/templates/hpa.yaml b/deploy-as-code/helm/charts/core-services/audit-service/templates/hpa.yaml
@@ -0,0 +1,2 @@
+# hpa.yaml
+{{- template "common.hpa" . -}}
diff --git a/deploy-as-code/helm/charts/core-services/audit-service/values.yaml b/deploy-as-code/helm/charts/core-services/audit-service/values.yaml
@@ -20,7 +20,7 @@ initContainers:
 # Container Configs
 image:
   repository: "audit-service"
-replicas: "1"
+#replicas: "1"
 healthChecks:
   enabled: true
   livenessProbePath: "/audit-service/health"
@@ -30,6 +30,11 @@ tracing-enabled: true
 heap: "-Xmx64m -Xms64m"
 java-args: "-Dspring.profiles.active=monitoring"
 
+memory_requests: "256Mi"
+memory_limits: "256Mi"
+cpu_limits: "20m"
+cpu_requests: "10m"
+
 # Additional Container Envs
 env: |
   - name: SPRING_KAFKA_CONSUMER_GROUP_ID

diff --git a/deploy-as-code/helm/charts/core-services/boundary-service/templates/hpa.yaml b/deploy-as-code/helm/charts/core-services/boundary-service/templates/hpa.yaml
@@ -0,0 +1,2 @@
+# hpa.yaml
+{{- template "common.hpa" . -}}
diff --git a/deploy-as-code/helm/charts/core-services/boundary-service/values.yaml b/deploy-as-code/helm/charts/core-services/boundary-service/values.yaml
@@ -19,7 +19,7 @@ initContainers:
 # Container Configs
 image:
   repository: "boundary-service"
-replicas: "1"
+#replicas: "1"
 healthChecks:
   enabled: true
   livenessProbePath: "/boundary-service/health"
@@ -35,6 +35,11 @@ kafka-topics-update-boundary-hierarchy: "update-boundary-hierarchy-definition"
 kafka-topics-create-boundary-relationship: "save-boundary-relationship"
 kafka-topics-update-boundary-relationship: "update-boundary-relationship"
 
+memory_requests: "256Mi"
+memory_limits: "512Mi"
+cpu_limits: "20m"
+cpu_requests: "10m"
+
 # Additional Container Envs
 env: |
   - name: SERVER_CONTEXT_PATH

diff --git a/deploy-as-code/helm/charts/core-services/chatbot/chatbot-values.yaml b/deploy-as-code/helm/charts/core-services/chatbot/chatbot-values.yaml
@@ -23,12 +23,17 @@ initContainers:
 # Container Configs
 image:
   repository: "chatbot"
-replicas: "1"
+#replicas: "1"
 appType: "java-spring"
 tracing-enabled: true
 heap: "-Xmx192m -Xms192m"
 java-args: ""
 
+memory_requests: "256Mi"
+memory_limits: "256Mi"
+cpu_limits: "20m"
+cpu_requests: "10m"
+
 # Additional Container Envs
 env: |  
   - name: KAFKA_BOOTSTRAP_SERVER

diff --git a/deploy-as-code/helm/charts/core-services/chatbot/home-isolation-chatbot-values.yaml b/deploy-as-code/helm/charts/core-services/chatbot/home-isolation-chatbot-values.yaml
@@ -37,11 +37,16 @@ initContainers:
 # Container Configs
 image:
   repository: "chatbot"
-replicas: "1"
+#replicas: "1"
 tracing-enabled: true
 heap: "-Xmx192m -Xms192m"
 java-args: ""
 
+memory_requests: "256Mi"
+memory_limits: "256Mi"
+cpu_limits: "20m"
+cpu_requests: "10m"
+
 # Additional Container Envs
 env: |  
   - name: SPRING_DATASOURCE_URL

diff --git a/deploy-as-code/helm/charts/core-services/chatbot/templates/hpa.yaml b/deploy-as-code/helm/charts/core-services/chatbot/templates/hpa.yaml
@@ -0,0 +1,2 @@
+# hpa.yaml
+{{- template "common.hpa" . -}}
diff --git a/deploy-as-code/helm/charts/core-services/egov-accesscontrol/templates/hpa.yaml b/deploy-as-code/helm/charts/core-services/egov-accesscontrol/templates/hpa.yaml
@@ -0,0 +1,2 @@
+# hpa.yaml
+{{- template "common.hpa" . -}}
diff --git a/deploy-as-code/helm/charts/core-services/egov-accesscontrol/values.yaml b/deploy-as-code/helm/charts/core-services/egov-accesscontrol/values.yaml
@@ -15,7 +15,7 @@ initContainers: {}
 # Container Configs
 image:
   repository: "egov-accesscontrol"
-replicas: "1"
+#replicas: "1"
 healthChecks:
   enabled: true
   livenessProbePath: "/access/health"
@@ -25,6 +25,11 @@ tracing-enabled: true
 heap: "-Xmx192m -Xms192m"
 java-args: ""
 
+memory_requests: "256Mi"
+memory_limits: "256Mi"
+cpu_limits: "20m"
+cpu_requests: "10m"
+
 # Additional Container Envs
 env: |
   - name: SERVER_PORT

diff --git a/deploy-as-code/helm/charts/core-services/egov-common-masters/templates/hpa.yaml b/deploy-as-code/helm/charts/core-services/egov-common-masters/templates/hpa.yaml
@@ -0,0 +1,2 @@
+# hpa.yaml
+{{- template "common.hpa" . -}}
diff --git a/deploy-as-code/helm/charts/core-services/egov-common-masters/values.yaml b/deploy-as-code/helm/charts/core-services/egov-common-masters/values.yaml
@@ -20,11 +20,16 @@ initContainers:
 # Container Configs
 image:
   repository: "egov-common-masters"
-replicas: "1"
+#replicas: "1"
 appType: "java-spring"
 tracing-enabled: true
 heap: "-Xmx192m -Xms192m"
 
+memory_requests: "256Mi"
+memory_limits: "256Mi"
+cpu_limits: "20m"
+cpu_requests: "10m"
+
 # Additional Container Envs
 env: |
   - name: SERVER_PORT

diff --git a/deploy-as-code/helm/charts/core-services/egov-data-uploader/templates/hpa.yaml b/deploy-as-code/helm/charts/core-services/egov-data-uploader/templates/hpa.yaml
@@ -0,0 +1,2 @@
+# hpa.yaml
+{{- template "common.hpa" . -}}
diff --git a/deploy-as-code/helm/charts/core-services/egov-data-uploader/values.yaml b/deploy-as-code/helm/charts/core-services/egov-data-uploader/values.yaml
@@ -19,14 +19,19 @@ initContainers:
 # Container Configs
 image:
   repository: "egov-data-uploader"
-replicas: "1"
+#replicas: "1"
 appType: "java-spring"
 tracing-enabled: true
 heap: "-Xmx64m -Xms64m"
 upload-json-path: ""
 template-download-prefix: ""
 internal-file-folder-path: ""
 
+memory_requests: "256Mi"
+memory_limits: "256Mi"
+cpu_limits: "20m"
+cpu_requests: "10m"
+
 # Additional Container Envs
 env: |
   - name: UPLOAD_JSON_PATH

diff --git a/deploy-as-code/helm/charts/core-services/egov-document-uploader/templates/hpa.yaml b/deploy-as-code/helm/charts/core-services/egov-document-uploader/templates/hpa.yaml
@@ -0,0 +1,2 @@
+# hpa.yaml
+{{- template "common.hpa" . -}}
diff --git a/deploy-as-code/helm/charts/core-services/egov-document-uploader/values.yaml b/deploy-as-code/helm/charts/core-services/egov-document-uploader/values.yaml
@@ -20,7 +20,7 @@ initContainers:
 # Container Configs
 image:
   repository: "egov-document-uploader"
-replicas: "1"
+#replicas: "1"
 healthChecks:
   enabled: true
   livenessProbePath: "/egov-document-uploader/health"
@@ -30,6 +30,11 @@ tracing-enabled: true
 heap: "-Xmx64m -Xms64m"
 java-args: "-Dspring.profiles.active=monitoring"
 
+memory_requests: "256Mi"
+memory_limits: "256Mi"
+cpu_limits: "20m"
+cpu_requests: "10m"
+
 # Additional Container Envs
 env: |
   - name: SPRING_KAFKA_CONSUMER_GROUP_ID

diff --git a/deploy-as-code/helm/charts/core-services/egov-enc-service/templates/hpa.yaml b/deploy-as-code/helm/charts/core-services/egov-enc-service/templates/hpa.yaml
@@ -0,0 +1,2 @@
+# hpa.yaml
+{{- template "common.hpa" . -}}
diff --git a/deploy-as-code/helm/charts/core-services/egov-enc-service/values.yaml b/deploy-as-code/helm/charts/core-services/egov-enc-service/values.yaml
@@ -20,7 +20,7 @@ initContainers:
 # Container Configs
 image:
   repository: "egov-enc-service"
-replicas: "1"
+#replicas: "1"
 # healthChecks:
 #   enabled: true
 #   livenessProbePath: "/egov-enc-service/health"
@@ -36,6 +36,11 @@ java-args: "-Dspring.profiles.active=monitoring"
 
 master-password-provider: software
 
+memory_requests: "256Mi"
+memory_limits: "512Mi"
+cpu_limits: "20m"
+cpu_requests: "10m"
+
 # Additional Container Envs
 env: |
   - name: SERVER_PORT

diff --git a/deploy-as-code/helm/charts/core-services/egov-filestore/templates/hpa.yaml b/deploy-as-code/helm/charts/core-services/egov-filestore/templates/hpa.yaml
@@ -0,0 +1,2 @@
+# hpa.yaml
+{{- template "common.hpa" . -}}
diff --git a/deploy-as-code/helm/charts/core-services/egov-filestore/values.yaml b/deploy-as-code/helm/charts/core-services/egov-filestore/values.yaml
@@ -19,7 +19,7 @@ ingress:
 # Container Configs
 image:
   repository: "egov-filestore"
-replicas: "1"
+#replicas: "1"
 healthChecks:
   enabled: true
   livenessProbePath: "/filestore/health"
@@ -36,6 +36,11 @@ is-s3-enabled: true
 persistence:
   enabled: false
 
+memory_requests: "256Mi"
+memory_limits: "512Mi"
+cpu_limits: "20m"
+cpu_requests: "10m"
+
 # Additional Container Envs
 env: |
   - name: SERVER_PORT

diff --git a/deploy-as-code/helm/charts/core-services/egov-idgen/templates/hpa.yaml b/deploy-as-code/helm/charts/core-services/egov-idgen/templates/hpa.yaml
@@ -0,0 +1,2 @@
+# hpa.yaml
+{{- template "common.hpa" . -}}
diff --git a/deploy-as-code/helm/charts/core-services/egov-idgen/values.yaml b/deploy-as-code/helm/charts/core-services/egov-idgen/values.yaml
@@ -20,7 +20,7 @@ initContainers:
 # Container Configs
 image:
   repository: "egov-idgen"
-replicas: "1"
+#replicas: "1"
 healthChecks:
   enabled: true
   livenessProbePath: "/egov-idgen/health"
@@ -32,6 +32,11 @@ java-args: "-Dspring.profiles.active=monitoring"
 idformat-from-mdms: "false"
 autocreate-new-seq: "false"
 
+memory_requests: "256Mi"
+memory_limits: "512Mi"
+cpu_limits: "20m"
+cpu_requests: "10m"
+
 # Additional Container Envs
 env: |
   - name: SERVER_PORT

diff --git a/deploy-as-code/helm/charts/core-services/egov-index-custom-consumer/templates/hpa.yaml b/deploy-as-code/helm/charts/core-services/egov-index-custom-consumer/templates/hpa.yaml
@@ -0,0 +1,2 @@
+# hpa.yaml
+{{- template "common.hpa" . -}}
diff --git a/deploy-as-code/helm/charts/core-services/egov-index-custom-consumer/values.yaml b/deploy-as-code/helm/charts/core-services/egov-index-custom-consumer/values.yaml
@@ -9,11 +9,16 @@ initContainers: {}
 # Container Configs
 image:
   repository: "egov-index-custom-consumer"
-replicas: "1"
+#replicas: "1"
 appType: "java-spring"
 tracing-enabled: true
 heap: "-Xmx192m -Xms192m"
 
+memory_requests: "256Mi"
+memory_limits: "256Mi"
+cpu_limits: "20m"
+cpu_requests: "10m"
+
 # Additional Container Envs
 env: |
   - name: EGOV_PT_HOST

diff --git a/deploy-as-code/helm/charts/core-services/egov-indexer/templates/hpa.yaml b/deploy-as-code/helm/charts/core-services/egov-indexer/templates/hpa.yaml
@@ -0,0 +1,2 @@
+# hpa.yaml
+{{- template "common.hpa" . -}}
diff --git a/deploy-as-code/helm/charts/core-services/egov-indexer/values.yaml b/deploy-as-code/helm/charts/core-services/egov-indexer/values.yaml
@@ -24,7 +24,7 @@ initContainers:
 # Container Configs
 image:
   repository: "egov-indexer"
-replicas: "1"
+#replicas: "1"
 healthChecks:
   enabled: true
   livenessProbePath: "/egov-indexer/health"
@@ -34,6 +34,11 @@ tracing-enabled: true
 egov-indexer-yaml-repo-path: "file:///work-dir/configs/egov-indexer/billingservices-indexer.yml,file:///work-dir/configs/egov-indexer/collection-indexer.yml,file:///work-dir/configs/egov-indexer/egov-telemetry-indexer.yml,file:///work-dir/configs/egov-indexer/egov-uploader-indexer.yml,file:///work-dir/configs/egov-indexer/error-queue.yml,file:///work-dir/configs/egov-indexer/finance-rolloutadotpion-indexer.yml,file:///work-dir/configs/egov-indexer/payment-indexer.yml,file:///work-dir/configs/egov-indexer/rainmaker-pgr-indexer.yml,file:///work-dir/configs/egov-indexer/rainmaker-pt-indexer.yml,file:///work-dir/configs/egov-indexer/tradelicense-indexer.yml,file:///work-dir/configs/egov-indexer/rainmaker-tl-indexer.yml"
 heap: "-Xmx192m -Xms192m"
 
+memory_requests: "512Mi"
+memory_limits: "768Mi"
+cpu_limits: "50m"
+cpu_requests: "10m"
+
 # Additional Container Envs
 env: |
   - name: EGOV_SERVICES_INFRA_INDEXER_HOST

diff --git a/deploy-as-code/helm/charts/core-services/egov-localization/templates/hpa.yaml b/deploy-as-code/helm/charts/core-services/egov-localization/templates/hpa.yaml
@@ -0,0 +1,2 @@
+# hpa.yaml
+{{- template "common.hpa" . -}}