[COMMON] Harmonize resource settings
Update all resource settings to the kubernetes recommended
normalized form. Fix ReadinessCheck resource limits.
Issue-ID: OOM-3273
Change-Id: Ie10903b801e4dc1689bcec092162d711a431a7a6
Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
diff --git a/kubernetes/sdc/components/sdc-be/templates/deployment.yaml b/kubernetes/sdc/components/sdc-be/templates/deployment.yaml
index 010c296..7c1d4a4 100644
--- a/kubernetes/sdc/components/sdc-be/templates/deployment.yaml
+++ b/kubernetes/sdc/components/sdc-be/templates/deployment.yaml
@@ -45,11 +45,11 @@
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
resources:
limits:
- cpu: 100m
- memory: 100Mi
+ cpu: "100m"
+ memory: "0.5Gi"
requests:
- cpu: 3m
- memory: 20Mi
+ cpu: "3m"
+ memory: "0.02Gi"
- name: {{ include "common.name" . }}-job-completion
image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: "{{ .Values.global.pullPolicy | default .Values.pullPolicy }}"
@@ -66,11 +66,11 @@
fieldPath: metadata.namespace
resources:
limits:
- cpu: 100m
- memory: 100Mi
+ cpu: "100m"
+ memory: "0.5Gi"
requests:
- cpu: 3m
- memory: 20Mi
+ cpu: "3m"
+ memory: "0.02Gi"
containers:
- name: {{ include "common.name" . }}
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
diff --git a/kubernetes/sdc/components/sdc-be/templates/job.yaml b/kubernetes/sdc/components/sdc-be/templates/job.yaml
index 5d50ab3..bdb6821 100644
--- a/kubernetes/sdc/components/sdc-be/templates/job.yaml
+++ b/kubernetes/sdc/components/sdc-be/templates/job.yaml
@@ -48,11 +48,11 @@
fieldPath: metadata.namespace
resources:
limits:
- cpu: 100m
- memory: 100Mi
+ cpu: "100m"
+ memory: "0.5Gi"
requests:
- cpu: 3m
- memory: 20Mi
+ cpu: "3m"
+ memory: "0.02Gi"
containers:
- name: {{ include "common.name" . }}-job
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.backendInitImage }}
@@ -71,11 +71,11 @@
fieldPath: status.podIP
resources:
limits:
- cpu: 800m
- memory: 1024Mi
+ cpu: "800m"
+ memory: "1Gi"
requests:
- cpu: 200m
- memory: 200Mi
+ cpu: "200m"
+ memory: "0.2Gi"
{{ include "common.waitForJobContainer" . | indent 6 | trim }}
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
volumes:
diff --git a/kubernetes/sdc/components/sdc-be/values.yaml b/kubernetes/sdc/components/sdc-be/values.yaml
index 074a166..7f914d4 100644
--- a/kubernetes/sdc/components/sdc-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-be/values.yaml
@@ -155,18 +155,18 @@
resources:
small:
limits:
- cpu: 1
- memory: 3Gi
+ cpu: "1"
+ memory: "3Gi"
requests:
- cpu: 0.5
- memory: 3Gi
+ cpu: "0.5"
+ memory: "3Gi"
large:
limits:
- cpu: 2
- memory: 6Gi
+ cpu: "2"
+ memory: "6Gi"
requests:
- cpu: 1
- memory: 6Gi
+ cpu: "1"
+ memory: "6Gi"
unlimited: {}
#Pods Service Account