[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/sdnc/components/dmaap-listener/templates/deployment.yaml b/kubernetes/sdnc/components/dmaap-listener/templates/deployment.yaml
index 03c5463..25f4033 100644
--- a/kubernetes/sdnc/components/dmaap-listener/templates/deployment.yaml
+++ b/kubernetes/sdnc/components/dmaap-listener/templates/deployment.yaml
@@ -65,6 +65,13 @@
image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-readiness
+ resources:
+ limits:
+ cpu: "100m"
+ memory: "0.5Gi"
+ requests:
+ cpu: "3m"
+ memory: "0.02Gi"
containers:
- command:
- /opt/onap/sdnc/dmaap-listener/bin/start-dmaap-listener.sh
diff --git a/kubernetes/sdnc/components/dmaap-listener/values.yaml b/kubernetes/sdnc/components/dmaap-listener/values.yaml
index 12bbdf0..084afa1 100644
--- a/kubernetes/sdnc/components/dmaap-listener/values.yaml
+++ b/kubernetes/sdnc/components/dmaap-listener/values.yaml
@@ -129,18 +129,18 @@
resources:
small:
limits:
- cpu: 1
- memory: 1Gi
+ cpu: "1"
+ memory: "1Gi"
requests:
- cpu: 0.5
- memory: 1Gi
+ cpu: "0.5"
+ memory: "1Gi"
large:
limits:
- cpu: 2
- memory: 2Gi
+ cpu: "2"
+ memory: "2Gi"
requests:
- cpu: 1
- memory: 2Gi
+ cpu: "1"
+ memory: "2Gi"
unlimited: {}
#Pods Service Account
diff --git a/kubernetes/sdnc/components/sdnc-ansible-server/templates/deployment.yaml b/kubernetes/sdnc/components/sdnc-ansible-server/templates/deployment.yaml
index 6bbb60c..b5c2a8e 100644
--- a/kubernetes/sdnc/components/sdnc-ansible-server/templates/deployment.yaml
+++ b/kubernetes/sdnc/components/sdnc-ansible-server/templates/deployment.yaml
@@ -61,6 +61,13 @@
image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-readiness
+ resources:
+ limits:
+ cpu: "100m"
+ memory: "0.5Gi"
+ requests:
+ cpu: "3m"
+ memory: "0.02Gi"
containers:
- name: {{ include "common.name" . }}
command: ["/bin/bash"]
diff --git a/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml b/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml
index e0e4c22..5a6b755 100644
--- a/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml
+++ b/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml
@@ -126,18 +126,18 @@
resources:
small:
limits:
- cpu: 1
- memory: 0.5Gi
+ cpu: "1"
+ memory: "0.5Gi"
requests:
- cpu: 0.5
- memory: 0.5Gi
+ cpu: "0.5"
+ memory: "0.5Gi"
large:
limits:
- cpu: 2
- memory: 1Gi
+ cpu: "2"
+ memory: "1Gi"
requests:
- cpu: 1
- memory: 1Gi
+ cpu: "1"
+ memory: "1Gi"
unlimited: {}
#Pods Service Account
diff --git a/kubernetes/sdnc/components/sdnc-prom/templates/deployment.yaml b/kubernetes/sdnc/components/sdnc-prom/templates/deployment.yaml
index 4e3b8cf..7443f69 100644
--- a/kubernetes/sdnc/components/sdnc-prom/templates/deployment.yaml
+++ b/kubernetes/sdnc/components/sdnc-prom/templates/deployment.yaml
@@ -40,6 +40,13 @@
image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-readiness
+ resources:
+ limits:
+ cpu: "100m"
+ memory: "0.5Gi"
+ requests:
+ cpu: "3m"
+ memory: "0.02Gi"
containers:
- name: {{ include "common.name" . }}
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
diff --git a/kubernetes/sdnc/components/sdnc-prom/values.yaml b/kubernetes/sdnc/components/sdnc-prom/values.yaml
index a1c0b1b..e2f3b34 100644
--- a/kubernetes/sdnc/components/sdnc-prom/values.yaml
+++ b/kubernetes/sdnc/components/sdnc-prom/values.yaml
@@ -96,18 +96,18 @@
resources:
small:
limits:
- cpu: 1
- memory: 0.5Gi
+ cpu: "1"
+ memory: "0.5Gi"
requests:
- cpu: 0.5
- memory: 0.5Gi
+ cpu: "0.5"
+ memory: "0.5Gi"
large:
limits:
- cpu: 2
- memory: 1Gi
+ cpu: "2"
+ memory: "1Gi"
requests:
- cpu: 1
- memory: 1Gi
+ cpu: "1"
+ memory: "1Gi"
unlimited: {}
#Pods Service Account
diff --git a/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml b/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml
index c99855d..4e16fcf 100644
--- a/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml
+++ b/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml
@@ -38,6 +38,13 @@
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
+ resources:
+ limits:
+ cpu: "100m"
+ memory: "0.5Gi"
+ requests:
+ cpu: "3m"
+ memory: "0.02Gi"
containers:
- name: {{ include "common.name" . }}
diff --git a/kubernetes/sdnc/components/sdnc-web/values.yaml b/kubernetes/sdnc/components/sdnc-web/values.yaml
index 7913dd4..265068b 100644
--- a/kubernetes/sdnc/components/sdnc-web/values.yaml
+++ b/kubernetes/sdnc/components/sdnc-web/values.yaml
@@ -93,18 +93,18 @@
resources:
small:
limits:
- cpu: 1
- memory: 0.5Gi
+ cpu: "1"
+ memory: "0.5Gi"
requests:
- cpu: 0.5
- memory: 0.5Gi
+ cpu: "0.5"
+ memory: "0.5Gi"
large:
limits:
- cpu: 2
- memory: 1Gi
+ cpu: "2"
+ memory: "1Gi"
requests:
- cpu: 1
- memory: 1Gi
+ cpu: "1"
+ memory: "1Gi"
unlimited: {}
#Pods Service Account
diff --git a/kubernetes/sdnc/components/ueb-listener/templates/deployment.yaml b/kubernetes/sdnc/components/ueb-listener/templates/deployment.yaml
index 0ca1601..8c19a21 100644
--- a/kubernetes/sdnc/components/ueb-listener/templates/deployment.yaml
+++ b/kubernetes/sdnc/components/ueb-listener/templates/deployment.yaml
@@ -70,6 +70,13 @@
image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-readiness
+ resources:
+ limits:
+ cpu: "100m"
+ memory: "0.5Gi"
+ requests:
+ cpu: "3m"
+ memory: "0.02Gi"
containers:
- command:
- /opt/onap/sdnc/ueb-listener/bin/start-ueb-listener.sh
diff --git a/kubernetes/sdnc/components/ueb-listener/values.yaml b/kubernetes/sdnc/components/ueb-listener/values.yaml
index 399305f..bccb1d7 100644
--- a/kubernetes/sdnc/components/ueb-listener/values.yaml
+++ b/kubernetes/sdnc/components/ueb-listener/values.yaml
@@ -149,18 +149,18 @@
resources:
small:
limits:
- cpu: 1
- memory: 1Gi
+ cpu: "1"
+ memory: "1Gi"
requests:
- cpu: 0.5
- memory: 1Gi
+ cpu: "0.5"
+ memory: "1Gi"
large:
limits:
- cpu: 2
- memory: 2Gi
+ cpu: "2"
+ memory: "2Gi"
requests:
- cpu: 1
- memory: 2Gi
+ cpu: "1"
+ memory: "2Gi"
unlimited: {}
#Pods Service Account
diff --git a/kubernetes/sdnc/templates/job.yaml b/kubernetes/sdnc/templates/job.yaml
index afe0e72..451c5b0 100755
--- a/kubernetes/sdnc/templates/job.yaml
+++ b/kubernetes/sdnc/templates/job.yaml
@@ -90,6 +90,13 @@
fieldPath: metadata.namespace
image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ resources:
+ limits:
+ cpu: "100m"
+ memory: "0.5Gi"
+ requests:
+ cpu: "3m"
+ memory: "0.02Gi"
containers:
- name: {{ include "common.name" . }}
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
diff --git a/kubernetes/sdnc/templates/sdnrdb-init-job.yaml b/kubernetes/sdnc/templates/sdnrdb-init-job.yaml
index e42757e..7e73f9d 100755
--- a/kubernetes/sdnc/templates/sdnrdb-init-job.yaml
+++ b/kubernetes/sdnc/templates/sdnrdb-init-job.yaml
@@ -46,6 +46,13 @@
fieldPath: metadata.namespace
image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ resources:
+ limits:
+ cpu: "100m"
+ memory: "0.5Gi"
+ requests:
+ cpu: "3m"
+ memory: "0.02Gi"
containers:
- name: {{ include "common.name" . }}-sdnrdb-init-job
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
diff --git a/kubernetes/sdnc/templates/statefulset.yaml b/kubernetes/sdnc/templates/statefulset.yaml
index 4607b62..ac34d2c 100644
--- a/kubernetes/sdnc/templates/statefulset.yaml
+++ b/kubernetes/sdnc/templates/statefulset.yaml
@@ -156,6 +156,13 @@
image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-readiness
+ resources:
+ limits:
+ cpu: "100m"
+ memory: "0.5Gi"
+ requests:
+ cpu: "3m"
+ memory: "0.02Gi"
{{ end }}
- name: {{ include "common.name" . }}-chown
image: {{ include "repositoryGenerator.image.busybox" . }}
diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index 72eb138..55f6a1d 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -667,18 +667,18 @@
resources:
small:
limits:
- cpu: 2
- memory: 4.7Gi
+ cpu: "2"
+ memory: "4.7Gi"
requests:
- cpu: 1
- memory: 4.7Gi
+ cpu: "1"
+ memory: "4.7Gi"
large:
limits:
- cpu: 4
- memory: 9.4Gi
+ cpu: "4"
+ memory: "9.4Gi"
requests:
- cpu: 2
- memory: 9.4Gi
+ cpu: "2"
+ memory: "9.4Gi"
unlimited: {}
#Pods Service Account