Merge "[OOM] Fixing k8s cpu limits"

15 files changed, 31 insertions, 31 deletions

diff --git a/kubernetes/so/components/so-admin-cockpit/values.yaml b/kubernetes/so/components/so-admin-cockpit/values.yaml
index 32074d94b5..2b05dbed1a 100644
--- a/kubernetes/so/components/so-admin-cockpit/values.yaml
+++ b/kubernetes/so/components/so-admin-cockpit/values.yaml
@@ -114,14 +114,14 @@ resources:
       cpu: 0.25
     limits:
       memory: 4Gi
-      cpu: 999
+      cpu: 0.5
   large:
     requests:
       memory: 2Gi
       cpu: 0.5
     limits:
       memory: 8Gi
-      cpu: 999
+      cpu: 1
   unlimited: {}
 readinessProbe:
   port: 9091
diff --git a/kubernetes/so/components/so-bpmn-infra/values.yaml b/kubernetes/so/components/so-bpmn-infra/values.yaml
index 0d5a0c4e59..80d5b67185 100755
--- a/kubernetes/so/components/so-bpmn-infra/values.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/values.yaml
@@ -136,14 +136,14 @@ resources:
   small:
     limits:
       memory: 3Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 3Gi
       cpu: 0.5
   large:
     limits:
       memory: 6Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 6Gi
       cpu: 1
diff --git a/kubernetes/so/components/so-catalog-db-adapter/values.yaml b/kubernetes/so/components/so-catalog-db-adapter/values.yaml
index 23a3b69355..619ef03775 100755
--- a/kubernetes/so/components/so-catalog-db-adapter/values.yaml
+++ b/kubernetes/so/components/so-catalog-db-adapter/values.yaml
@@ -100,14 +100,14 @@ resources:
   small:
     limits:
       memory: 1.5Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1.5Gi
       cpu: 0.5
   large:
     limits:
       memory: 3Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 3Gi
       cpu: 1
diff --git a/kubernetes/so/components/so-cnf-adapter/values.yaml b/kubernetes/so/components/so-cnf-adapter/values.yaml
index 09e631a6e0..3855c19a50 100755
--- a/kubernetes/so/components/so-cnf-adapter/values.yaml
+++ b/kubernetes/so/components/so-cnf-adapter/values.yaml
@@ -122,14 +122,14 @@ resources:
   small:
     limits:
       memory: 1Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1Gi
       cpu: 0.5
   large:
     limits:
       memory: 2Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 2Gi
       cpu: 1
diff --git a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
index 32171baf20..2084befa14 100644
--- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
+++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
@@ -113,17 +113,17 @@ resources:
   small:
     limits:
       memory: 1Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1Gi
       cpu: 0.5
   large:
     limits:
       memory: 5Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 2Gi
-      cpu: 4
+      cpu: 1
   unlimited: {}
 
 livenessProbe:
diff --git a/kubernetes/so/components/so-etsi-sol003-adapter/values.yaml b/kubernetes/so/components/so-etsi-sol003-adapter/values.yaml
index 0c02cb2132..ca4e787526 100755
--- a/kubernetes/so/components/so-etsi-sol003-adapter/values.yaml
+++ b/kubernetes/so/components/so-etsi-sol003-adapter/values.yaml
@@ -87,14 +87,14 @@ resources:
   small:
     limits:
       memory: 1Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1Gi
       cpu: 0.5
   large:
     limits:
       memory: 2Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 2Gi
       cpu: 1
diff --git a/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml b/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml
index e2816b0cfc..f565eb0a70 100755
--- a/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml
+++ b/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml
@@ -96,14 +96,14 @@ resources:
   small:
     limits:
       memory: 1Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1Gi
       cpu: 0.5
   large:
     limits:
       memory: 2Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 2Gi
       cpu: 1
diff --git a/kubernetes/so/components/so-nssmf-adapter/values.yaml b/kubernetes/so/components/so-nssmf-adapter/values.yaml
index c6a6f351db..8e83734a9f 100755
--- a/kubernetes/so/components/so-nssmf-adapter/values.yaml
+++ b/kubernetes/so/components/so-nssmf-adapter/values.yaml
@@ -121,14 +121,14 @@ resources:
   small:
     limits:
       memory: 1Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1Gi
       cpu: 0.5
   large:
     limits:
       memory: 2Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 2Gi
       cpu: 1
diff --git a/kubernetes/so/components/so-oof-adapter/values.yaml b/kubernetes/so/components/so-oof-adapter/values.yaml
index 24a171cf99..3ce43c679c 100755
--- a/kubernetes/so/components/so-oof-adapter/values.yaml
+++ b/kubernetes/so/components/so-oof-adapter/values.yaml
@@ -103,14 +103,14 @@ resources:
   small:
     limits:
       memory: 1Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1Gi
       cpu: 0.5
   large:
     limits:
       memory: 2Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 2Gi
       cpu: 1
diff --git a/kubernetes/so/components/so-openstack-adapter/values.yaml b/kubernetes/so/components/so-openstack-adapter/values.yaml
index 3258f8f2df..3b68a362cb 100755
--- a/kubernetes/so/components/so-openstack-adapter/values.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/values.yaml
@@ -105,14 +105,14 @@ resources:
   small:
     limits:
       memory: 1.5Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1.5Gi
       cpu: 0.5
   large:
     limits:
       memory: 3Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 3Gi
       cpu: 1
diff --git a/kubernetes/so/components/so-request-db-adapter/values.yaml b/kubernetes/so/components/so-request-db-adapter/values.yaml
index 0ec56c07c6..5f02a85eb3 100755
--- a/kubernetes/so/components/so-request-db-adapter/values.yaml
+++ b/kubernetes/so/components/so-request-db-adapter/values.yaml
@@ -96,14 +96,14 @@ resources:
   small:
     limits:
       memory: 1.5Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1.5Gi
       cpu: 0.5
   large:
     limits:
       memory: 3Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 3Gi
       cpu: 1
diff --git a/kubernetes/so/components/so-sdc-controller/values.yaml b/kubernetes/so/components/so-sdc-controller/values.yaml
index eea19df8c1..77b94dde50 100755
--- a/kubernetes/so/components/so-sdc-controller/values.yaml
+++ b/kubernetes/so/components/so-sdc-controller/values.yaml
@@ -107,14 +107,14 @@ resources:
   small:
     limits:
       memory: 1.5Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1.5Gi
       cpu: 0.5
   large:
     limits:
       memory: 3Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 3Gi
       cpu: 1
diff --git a/kubernetes/so/components/so-sdnc-adapter/values.yaml b/kubernetes/so/components/so-sdnc-adapter/values.yaml
index 1f0a18d143..9542ab8e99 100755
--- a/kubernetes/so/components/so-sdnc-adapter/values.yaml
+++ b/kubernetes/so/components/so-sdnc-adapter/values.yaml
@@ -116,14 +116,14 @@ resources:
   small:
     limits:
       memory: 1.5Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1.5Gi
       cpu: 0.5
   large:
     limits:
       memory: 3Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 3Gi
       cpu: 1
diff --git a/kubernetes/so/components/so-ve-vnfm-adapter/values.yaml b/kubernetes/so/components/so-ve-vnfm-adapter/values.yaml
index e1d211c55b..183e7f60a7 100755
--- a/kubernetes/so/components/so-ve-vnfm-adapter/values.yaml
+++ b/kubernetes/so/components/so-ve-vnfm-adapter/values.yaml
@@ -53,14 +53,14 @@ resources:
   small:
     limits:
       memory: 1Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1Gi
       cpu: 0.5
   large:
     limits:
       memory: 2Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 2Gi
       cpu: 1
diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml
index bf412e8349..81cd1d9662 100755
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@ -549,14 +549,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 4Gi
     requests:
       cpu: 0.5
       memory: 1Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 8Gi
     requests:
       cpu: 1