From 00c293bafd9d9515252e61fc9f3cf0fcc29d79c6 Mon Sep 17 00:00:00 2001 From: lakshay <lakshay22csu100@ncuindia.edu> Date: Wed, 15 Jan 2025 18:54:38 +0530 Subject: [PATCH 1/2] Issue: Set default resource for builder pod In this I have limit the heap size to use only 75% of available memory. I have also set maximun and minimum heap sizes --- build/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build/Dockerfile b/build/Dockerfile index f1523076cf..8964bafe88 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -22,7 +22,9 @@ ARG MAVEN_HOME="/usr/share/maven" ARG MAVEN_DIST_URL="https://archive.apache.org/dist/maven/maven-3/${MAVEN_DEFAULT_VERSION}/binaries/apache-maven-${MAVEN_DEFAULT_VERSION}-bin.zip" ARG MVNW_DIR="/usr/share/maven/mvnw/" ARG MVN_REPO="/etc/maven/m2" -ARG MAVEN_OPTS="" +ARG MAVEN_OPTS="-Xmx512m -Xms256m -XX:MaxRAMPercentage=75.0" + +ENV JAVA_OPTS="-XX:+UseContainerSupport -XX:MaxRAMPercentage=75.0 -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap" USER 0 From 5b6c493f0e3b261fbe6618042da3bf0c549d9fc7 Mon Sep 17 00:00:00 2001 From: lakshay <lakshay22csu100@ncuindia.edu> Date: Thu, 16 Jan 2025 00:13:08 +0530 Subject: [PATCH 2/2] #5811 Issue: Set Default Resource for Builder Pod --- build/Dockerfile | 4 +--- pkg/resources/config/manager/operator-deployment.yaml | 9 +++++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 8964bafe88..f1523076cf 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -22,9 +22,7 @@ ARG MAVEN_HOME="/usr/share/maven" ARG MAVEN_DIST_URL="https://archive.apache.org/dist/maven/maven-3/${MAVEN_DEFAULT_VERSION}/binaries/apache-maven-${MAVEN_DEFAULT_VERSION}-bin.zip" ARG MVNW_DIR="/usr/share/maven/mvnw/" ARG MVN_REPO="/etc/maven/m2" -ARG MAVEN_OPTS="-Xmx512m -Xms256m -XX:MaxRAMPercentage=75.0" - -ENV JAVA_OPTS="-XX:+UseContainerSupport -XX:MaxRAMPercentage=75.0 -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap" +ARG MAVEN_OPTS="" USER 0 diff --git a/pkg/resources/config/manager/operator-deployment.yaml b/pkg/resources/config/manager/operator-deployment.yaml index 2cf4918214..fc7adfbbe3 100644 --- a/pkg/resources/config/manager/operator-deployment.yaml +++ b/pkg/resources/config/manager/operator-deployment.yaml @@ -83,8 +83,13 @@ spec: memory: "2Gi" cpu: "500m" limits: - memory: "8Gi" - cpu: "2" + - default: + memory: "8Gi" + cpu: "2" + defaultRequest: + memory: "512Mi" + cpu: "300m" + type:container securityContext: runAsNonRoot: true seccompProfile: