hardware resources aligned with requirements

- as per requirements for the required amount of hardware resources for
  the services below are mimiced:
- cps-and-ncmp
  dmi-plugin
  dbpostgresql

Issue-ID: CPS-2961

Change-Id: Iee3774a4912baefd4346e499b0ae0bfc7ad1c9fb
Signed-off-by: halil.cakal <halil.cakal@est.tech>

diff --git a/cps-charts/templates/cps-deployment.yaml b/cps-charts/templates/cps-deployment.yaml
index 2e12ad4..604b1bb 100644 (file)
--- a/cps-charts/templates/cps-deployment.yaml
+++ b/cps-charts/templates/cps-deployment.yaml
@@ -33,6 +33,9 @@ spec:
             - name: CPS_NCMP_SERVICE_NAME
               value: {{ include "cps-and-ncmp.name" . }}-cps-hazelcast
           resources:
+            requests:
+              cpu: {{ .Values.cps.resources.requests.cpu }}
+              memory: {{ .Values.cps.resources.requests.memory }}
             limits:
               cpu: {{ .Values.cps.resources.limits.cpu }}
               memory: {{ .Values.cps.resources.limits.memory }}

diff --git a/cps-charts/templates/kafka-deployment.yaml b/cps-charts/templates/kafka-deployment.yaml
index ecfc865..9d3978f 100644 (file)
--- a/cps-charts/templates/kafka-deployment.yaml
+++ b/cps-charts/templates/kafka-deployment.yaml
@@ -40,6 +40,9 @@ spec:
             - name: KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR
               value: "{{ .Values.kafka.offsetsTopicReplicationFactor }}"
           resources:
+            requests:
+              cpu: {{ .Values.kafka.resources.requests.cpu }}
+              memory: {{ .Values.kafka.resources.requests.memory }}
             limits:
               cpu: "{{ .Values.kafka.resources.limits.cpu }}"
               memory: "{{ .Values.kafka.resources.limits.memory }}"

diff --git a/cps-charts/templates/postgresql-deployment.yaml b/cps-charts/templates/postgresql-deployment.yaml
index 9b29b16..3f888f7 100644 (file)
--- a/cps-charts/templates/postgresql-deployment.yaml
+++ b/cps-charts/templates/postgresql-deployment.yaml
@@ -33,6 +33,9 @@ spec:
             - name: init-sql
               mountPath: {{ .Values.postgresql.initSql.mountPath }}
           resources:
+            requests:
+              cpu: {{ .Values.postgresql.resources.requests.cpu }}
+              memory: {{ .Values.postgresql.resources.requests.memory }}
             limits:
               cpu: {{ .Values.postgresql.resources.limits.cpu }}
               memory: {{ .Values.postgresql.resources.limits.memory }}

diff --git a/cps-charts/templates/zookeeper-deployment.yaml b/cps-charts/templates/zookeeper-deployment.yaml
index 45c39dc..6e14c16 100644 (file)
--- a/cps-charts/templates/zookeeper-deployment.yaml
+++ b/cps-charts/templates/zookeeper-deployment.yaml
@@ -41,6 +41,9 @@ spec:
             timeoutSeconds: {{ .Values.zookeeper.healthcheck.timeout | int }}
             failureThreshold: {{ .Values.zookeeper.healthcheck.retries | int }}
           resources:
+            requests:
+              cpu: {{ .Values.zookeeper.resources.requests.cpu }}
+              memory: {{ .Values.zookeeper.resources.requests.memory }}
             limits:
               cpu: {{ .Values.zookeeper.resources.limits.cpu }}
               memory: {{ .Values.zookeeper.resources.limits.memory }}

diff --git a/cps-charts/values.yaml b/cps-charts/values.yaml
index 53597a7..dd0c362 100644 (file)
--- a/cps-charts/values.yaml
+++ b/cps-charts/values.yaml
@@ -1,8 +1,11 @@
 postgresql:
   image: "postgres:14.1-alpine"
   resources:
+    requests:
+      cpu: "2000m"
+      memory: "1Gi"
     limits:
-      cpu: "6"
+      cpu: "6000m"
       memory: "3Gi"
   servicePort: 5432
   env:
@@ -26,9 +29,12 @@ cps:
     port: 8080
     nodePort: 30080
   resources:
-    limits:
-      cpu: "3"
+    requests:
+      cpu: "2000m"
       memory: "3Gi"
+    limits:
+      cpu: "6000m"
+      memory: "5Gi"
   env:
     DB_HOST: "cps-cps-and-ncmp-postgresql"
     DB_USERNAME: "cps"
@@ -73,9 +79,12 @@ kafka:
   listenerSecurityProtocolMap: "INTERNAL:PLAINTEXT,EXTERNAL:PLAINTEXT,NODEPORT:PLAINTEXT"
   offsetsTopicReplicationFactor: 1
   resources:
+    requests:
+      cpu: "500m"
+      memory: "512Mi"
     limits:
-      cpu: "1"
-      memory: "3Gi"
+      cpu: "2000m"
+      memory: "2Gi"
   healthcheck:
     enabled: true
     command: >
@@ -95,9 +104,12 @@ zookeeper:
     type: ClusterIP
     port: 2181
   resources:
+    requests:
+      cpu: "500m"
+      memory: "512Mi"
     limits:
-      cpu: "1"
-      memory: "3Gi"
+      cpu: "1000m"
+      memory: "1Gi"
   env:
     ZOOKEEPER_CLIENT_PORT: 2181
   healthcheck:
@@ -130,9 +142,12 @@ dmiStub:
     READ_DATA_FOR_CM_HANDLE_DELAY_MS: 300
     WRITE_DATA_FOR_CM_HANDLE_DELAY_MS: 670
   resources:
+    requests:
+      cpu: "100m"
+      memory: "350Mi"
     limits:
-      cpu: "3"
-      memory: "3Gi"
+      cpu: "1000m"
+      memory: "2Gi"
   livenessProbe:
     httpGet:
       path: /actuator/health/readiness