From 8cbb3d9b964b774b1400df5d909913b669c2a243 Mon Sep 17 00:00:00 2001 From: Andreas Geissler Date: Tue, 12 Mar 2024 16:44:56 +0100 Subject: [COMMON] Harmonize resource settings, Part 2 Some settings are still wrongly interpreted (e.g. 0.02Gi) Therefor they are changed to non-floating numbers (e.g. 20Mi) Issue-ID: OOM-3273 Change-Id: Icc88dead1ac5b1df8629d6adcc438a739e20522e Signed-off-by: Andreas Geissler --- kubernetes/policy/components/policy-api/templates/deployment.yaml | 4 ++-- .../policy/components/policy-clamp-ac-kserve-ppnt/values.yaml | 4 ++-- .../components/policy-clamp-runtime-acm/templates/deployment.yaml | 4 ++-- kubernetes/policy/components/policy-distribution/values.yaml | 4 ++-- .../components/policy-drools-pdp/templates/statefulset.yaml | 8 ++++---- kubernetes/policy/components/policy-drools-pdp/values.yaml | 4 ++-- kubernetes/policy/components/policy-gui/templates/deployment.yaml | 4 ++-- kubernetes/policy/components/policy-gui/values.yaml | 4 ++-- kubernetes/policy/components/policy-nexus/values.yaml | 2 +- kubernetes/policy/components/policy-pap/templates/deployment.yaml | 4 ++-- .../policy/components/policy-xacml-pdp/templates/deployment.yaml | 4 ++-- kubernetes/policy/templates/job.yaml | 8 ++++---- 12 files changed, 27 insertions(+), 27 deletions(-) (limited to 'kubernetes/policy') diff --git a/kubernetes/policy/components/policy-api/templates/deployment.yaml b/kubernetes/policy/components/policy-api/templates/deployment.yaml index e7e8e52f69..0456c866a8 100755 --- a/kubernetes/policy/components/policy-api/templates/deployment.yaml +++ b/kubernetes/policy/components/policy-api/templates/deployment.yaml @@ -29,10 +29,10 @@ spec: resources: limits: cpu: "100m" - memory: "0.5Gi" + memory: "500Mi" requests: cpu: "3m" - memory: "0.02Gi" + memory: "20Mi" - command: - sh args: diff --git a/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/values.yaml index 12dc5020a9..a432fff142 100755 --- a/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/values.yaml +++ b/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/values.yaml @@ -95,10 +95,10 @@ resources: small: limits: cpu: "1" - memory: "0.7Gi" + memory: "700Mi" requests: cpu: "0.5" - memory: "0.7Gi" + memory: "700Mi" large: limits: cpu: "2" diff --git a/kubernetes/policy/components/policy-clamp-runtime-acm/templates/deployment.yaml b/kubernetes/policy/components/policy-clamp-runtime-acm/templates/deployment.yaml index 7b6b98545a..67a70227c0 100644 --- a/kubernetes/policy/components/policy-clamp-runtime-acm/templates/deployment.yaml +++ b/kubernetes/policy/components/policy-clamp-runtime-acm/templates/deployment.yaml @@ -48,10 +48,10 @@ spec: resources: limits: cpu: "100m" - memory: "0.5Gi" + memory: "500Mi" requests: cpu: "3m" - memory: "0.02Gi" + memory: "20Mi" - command: - sh args: diff --git a/kubernetes/policy/components/policy-distribution/values.yaml b/kubernetes/policy/components/policy-distribution/values.yaml index 0fc6443559..fd2fe2e5df 100755 --- a/kubernetes/policy/components/policy-distribution/values.yaml +++ b/kubernetes/policy/components/policy-distribution/values.yaml @@ -128,10 +128,10 @@ resources: small: limits: cpu: "1" - memory: "0.5Gi" + memory: "500Mi" requests: cpu: "0.5" - memory: "0.5Gi" + memory: "500Mi" large: limits: cpu: "2" diff --git a/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml b/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml index c483b5fd3d..ed09551e6a 100755 --- a/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml +++ b/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml @@ -43,10 +43,10 @@ spec: resources: limits: cpu: "100m" - memory: "0.5Gi" + memory: "500Mi" requests: cpu: "3m" - memory: "0.02Gi" + memory: "20Mi" {{- if not .Values.nexus.offline }} - command: - /app/ready.py @@ -65,10 +65,10 @@ spec: resources: limits: cpu: "100m" - memory: "0.5Gi" + memory: "500Mi" requests: cpu: "3m" - memory: "0.02Gi" + memory: "20Mi" {{- end }} containers: - name: {{ include "common.name" . }} diff --git a/kubernetes/policy/components/policy-drools-pdp/values.yaml b/kubernetes/policy/components/policy-drools-pdp/values.yaml index dfd5e8f73e..6e86b3e64a 100755 --- a/kubernetes/policy/components/policy-drools-pdp/values.yaml +++ b/kubernetes/policy/components/policy-drools-pdp/values.yaml @@ -158,10 +158,10 @@ resources: small: limits: cpu: "1" - memory: "0.8Gi" + memory: "800Mi" requests: cpu: "0.5" - memory: "0.8Gi" + memory: "800Mi" large: limits: cpu: "2" diff --git a/kubernetes/policy/components/policy-gui/templates/deployment.yaml b/kubernetes/policy/components/policy-gui/templates/deployment.yaml index f175777d91..ba90086315 100644 --- a/kubernetes/policy/components/policy-gui/templates/deployment.yaml +++ b/kubernetes/policy/components/policy-gui/templates/deployment.yaml @@ -61,10 +61,10 @@ spec: resources: limits: cpu: "100m" - memory: "0.5Gi" + memory: "500Mi" requests: cpu: "3m" - memory: "0.02Gi" + memory: "20Mi" containers: # side car containers {{ if .Values.global.centralizedLoggingEnabled }}{{ include "common.log.sidecar" . | nindent 8 }}{{ end }} diff --git a/kubernetes/policy/components/policy-gui/values.yaml b/kubernetes/policy/components/policy-gui/values.yaml index 3aaf001bc8..3338d8f724 100644 --- a/kubernetes/policy/components/policy-gui/values.yaml +++ b/kubernetes/policy/components/policy-gui/values.yaml @@ -110,10 +110,10 @@ resources: small: limits: cpu: "1" - memory: "0.7Gi" + memory: "700Mi" requests: cpu: "0.5" - memory: "0.7Gi" + memory: "700Mi" large: limits: cpu: "2" diff --git a/kubernetes/policy/components/policy-nexus/values.yaml b/kubernetes/policy/components/policy-nexus/values.yaml index f9cb1084be..f10d55dcee 100755 --- a/kubernetes/policy/components/policy-nexus/values.yaml +++ b/kubernetes/policy/components/policy-nexus/values.yaml @@ -87,7 +87,7 @@ resources: memory: "1Gi" requests: cpu: "1m" - memory: "0.5Gi" + memory: "500Mi" large: limits: cpu: "2" diff --git a/kubernetes/policy/components/policy-pap/templates/deployment.yaml b/kubernetes/policy/components/policy-pap/templates/deployment.yaml index 5ff3062538..7346b99c55 100755 --- a/kubernetes/policy/components/policy-pap/templates/deployment.yaml +++ b/kubernetes/policy/components/policy-pap/templates/deployment.yaml @@ -52,10 +52,10 @@ spec: resources: limits: cpu: "100m" - memory: "0.5Gi" + memory: "500Mi" requests: cpu: "3m" - memory: "0.02Gi" + memory: "20Mi" - command: - sh args: diff --git a/kubernetes/policy/components/policy-xacml-pdp/templates/deployment.yaml b/kubernetes/policy/components/policy-xacml-pdp/templates/deployment.yaml index f3cccff32b..e89dd7c8fe 100755 --- a/kubernetes/policy/components/policy-xacml-pdp/templates/deployment.yaml +++ b/kubernetes/policy/components/policy-xacml-pdp/templates/deployment.yaml @@ -45,10 +45,10 @@ spec: resources: limits: cpu: "100m" - memory: "0.5Gi" + memory: "500Mi" requests: cpu: "3m" - memory: "0.02Gi" + memory: "20Mi" - command: - sh args: diff --git a/kubernetes/policy/templates/job.yaml b/kubernetes/policy/templates/job.yaml index 2a61429544..7129392e39 100755 --- a/kubernetes/policy/templates/job.yaml +++ b/kubernetes/policy/templates/job.yaml @@ -218,10 +218,10 @@ spec: resources: limits: cpu: "100m" - memory: "0.5Gi" + memory: "500Mi" requests: cpu: "3m" - memory: "0.02Gi" + memory: "20Mi" containers: - name: {{ include "common.name" . }}-galera-db-migrator image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.dbmigrator.image }} @@ -317,10 +317,10 @@ spec: resources: limits: cpu: "100m" - memory: "0.5Gi" + memory: "500Mi" requests: cpu: "3m" - memory: "0.02Gi" + memory: "20Mi" containers: - name: {{ include "common.name" . }}-pg-db-migrator image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.dbmigrator.image }} -- cgit 1.2.3-korg