From 44d8b3381c06014e55c169063758b89b31f553ca Mon Sep 17 00:00:00 2001
From: Andreas Geissler <andreas-geissler@telekom.de>
Date: Mon, 3 Mar 2025 09:19:17 +0100
Subject: [PATCH] [SDNC] SDNC resource limits corrected

As the SDNC pod JVM limits are set to max 6Gi, the pod limits need to
be increased as well, otherwise the pod gets OOMKilled.
Instead of using fixed memory limits, now the maxRAMPercentage is defined.

Issue-ID: OOM-3332

Change-Id: I90245f5c1c5501be5e7a7deca9a722d70a82a267
Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
---
 kubernetes/sdnc/templates/statefulset.yaml |  2 +-
 kubernetes/sdnc/values.yaml                | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/kubernetes/sdnc/templates/statefulset.yaml b/kubernetes/sdnc/templates/statefulset.yaml
index 5d2503089c..5a89df5732 100644
--- a/kubernetes/sdnc/templates/statefulset.yaml
+++ b/kubernetes/sdnc/templates/statefulset.yaml
@@ -290,7 +290,7 @@ spec:
           - name: JAVA_HOME
             value: "{{ .Values.config.javaHome}}"
           - name: JAVA_OPTS
-            value: "-Xms{{.Values.config.odl.javaOptions.minMemory}} -Xmx{{.Values.config.odl.javaOptions.maxMemory}}"
+            value: "-XX:MaxRAMPercentage={{.Values.config.odl.javaOptions.maxRAMPercentage}}"
           - name: LOG4J_FORMAT_MSG_NO_LOOKUPS
             value: "true"
           - name: KARAF_CONSOLE_LOG_LEVEL
diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index 69c81f8087..c19a67fb8a 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -316,8 +316,7 @@ config:
       maxGCPauseMillis: 100
       parallelGCThreads : 3
       numberGCLogFiles: 10
-      minMemory: 1028m
-      maxMemory: 6144m
+      maxRAMPercentage: 70
       gcLogOptions: ""
       # Next line enables gc logging
       # gcLogOptions: "-Xlog:gc=trace:file={{.Values.config.odl.gcLogDir}}/gc-%t.log}:time,level,tags:filecount={{.Values.config.odl.javaOptions.numberGCLogFiles}}"
@@ -668,17 +667,17 @@ resources:
   small:
     limits:
       cpu: "2"
-      memory: "4.7Gi"
+      memory: "7Gi"
     requests:
       cpu: "1"
-      memory: "4.7Gi"
+      memory: "7Gi"
   large:
     limits:
       cpu: "4"
-      memory: "9.4Gi"
+      memory: "10Gi"
     requests:
       cpu: "2"
-      memory: "9.4Gi"
+      memory: "10Gi"
   unlimited: {}
 
 #Pods Service Account
-- 
2.16.6