From 808e3eb49630e0c1fe63fb43571a4582a85f08f7 Mon Sep 17 00:00:00 2001
From: Andreas Geissler <andreas-geissler@telekom.de>
Date: Mon, 18 Mar 2024 12:05:51 +0100
Subject: [PATCH] [MONGODB] Set default resource settings for mongodb

Set the resources settings for mongodb in:
- NBI
- DCAEGEN2/TCAEGEN2
- MULTICLOUD/K8S

Issue-ID: OOM-3277

Change-Id: I3454120d920edf3ae45eb1ebb0132cf5133e1575
Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
---
 kubernetes/dcaegen2-services/Chart.yaml            |  2 +-
 .../components/dcae-tcagen2/values.yaml            | 13 +++----
 kubernetes/multicloud/Chart.yaml                   |  2 +-
 .../components/multicloud-k8s/values.yaml          | 40 +++++++++++-----------
 kubernetes/nbi/values.yaml                         | 14 ++++----
 5 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/kubernetes/dcaegen2-services/Chart.yaml b/kubernetes/dcaegen2-services/Chart.yaml
index cd6893ea08..ade33b4c3f 100644
--- a/kubernetes/dcaegen2-services/Chart.yaml
+++ b/kubernetes/dcaegen2-services/Chart.yaml
@@ -22,7 +22,7 @@ apiVersion: v2
 appVersion: "NewDelhi"
 description: DCAE Microservices
 name: dcaegen2-services
-version: 13.0.2
+version: 13.1.0
 
 dependencies:
   - name: common
diff --git a/kubernetes/dcaegen2-services/components/dcae-tcagen2/values.yaml b/kubernetes/dcaegen2-services/components/dcae-tcagen2/values.yaml
index 65e3cc0bd6..f66ab0acaa 100644
--- a/kubernetes/dcaegen2-services/components/dcae-tcagen2/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-tcagen2/values.yaml
@@ -102,12 +102,13 @@ mongodb:
   service:
     nameOverride: dcae-mongohost
     internalPort: 27017
-  nfsprovisionerPrefix: dcaemongo
-  sdnctlPrefix: tcagen2
-  persistence:
-    mountSubPath: dcae/mongo/data
-    enabled: true
-  disableNfsProvisioner: true
+  resources:
+    limits:
+      cpu: "1"
+      memory: "1Gi"
+    requests:
+      cpu: "500m"
+      memory: "1Gi"
 
 # Policy configuraiton properties
 # if enabled, policy-sync side car will be deployed
diff --git a/kubernetes/multicloud/Chart.yaml b/kubernetes/multicloud/Chart.yaml
index b6bb442906..48a3b9631a 100644
--- a/kubernetes/multicloud/Chart.yaml
+++ b/kubernetes/multicloud/Chart.yaml
@@ -18,7 +18,7 @@
 apiVersion: v2
 description: ONAP multicloud broker
 name: multicloud
-version: 13.0.0
+version: 13.1.0
 
 dependencies:
   - name: common
diff --git a/kubernetes/multicloud/components/multicloud-k8s/values.yaml b/kubernetes/multicloud/components/multicloud-k8s/values.yaml
index 932399e735..5c9c0ad864 100644
--- a/kubernetes/multicloud/components/multicloud-k8s/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-k8s/values.yaml
@@ -108,14 +108,26 @@ mongodb:
     port: 27017
   auth:
     enabled: false
-  #nfsprovisionerPrefix: multicloud-k8s
-  #sdnctlPrefix: multicloud-k8s
-  #persistence:
-  #  mountSubPath: multicloud-k8s/mongo/data
-  #  enabled: true
-  #disableNfsProvisioner: true
-  flavor: &storage_flavor large
-  resources: &storage_resources
+  resources:
+    limits:
+      cpu: "2"
+      memory: "2Gi"
+    requests:
+      cpu: "500m"
+      memory: "2Gi"
+
+#etcd chart overrides for k8splugin
+etcd:
+  nameOverride: multicloud-k8s-etcd
+  service:
+    name: multicloud-k8s-etcd
+    clientPortName: tcp-etcd-client
+    peerPortName: tcp-etcd-server
+  persistence:
+    mountSubPath: multicloud-k8s/etcd/data
+    enabled: true
+  flavor: large
+  resources:
     small:
       limits:
         cpu: "100m"
@@ -132,18 +144,6 @@ mongodb:
         memory: "300Mi"
     unlimited: {}
 
-#etcd chart overrides for k8splugin
-etcd:
-  nameOverride: multicloud-k8s-etcd
-  service:
-    name: multicloud-k8s-etcd
-    clientPortName: tcp-etcd-client
-    peerPortName: tcp-etcd-server
-  persistence:
-    mountSubPath: multicloud-k8s/etcd/data
-    enabled: true
-  flavor: *storage_flavor
-  resources: *storage_resources
 
 # No persistence right now as we rely on Mongo to handle that
 persistence:
diff --git a/kubernetes/nbi/values.yaml b/kubernetes/nbi/values.yaml
index d8e5f0d697..0d143dc6c6 100644
--- a/kubernetes/nbi/values.yaml
+++ b/kubernetes/nbi/values.yaml
@@ -119,13 +119,13 @@ mongodb:
   service:
     nameOverride: nbi-mongohost
     internalPort: 27017
-  #nfsprovisionerPrefix: nbi
-  #sdnctlPrefix: nbi
-  #persistence:
-  #  mountSubPath: nbi/mongo/data
-  #  enabled: true
-  #disableNfsProvisioner: true
-
+  resources:
+    limits:
+      cpu: "1"
+      memory: "1Gi"
+    requests:
+      cpu: "500m"
+      memory: "1Gi"
 
 # default number of instances
 replicaCount: 1
-- 
2.16.6