auto-instrumentation: increase default memory request to 100Mi (#29392)

DataDog · Sep 17, 2024 · 023ef59 · 023ef59
1 parent da79543
commit 023ef59
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/pkg/clusteragent/admission/mutate/autoinstrumentation/auto_instrumentation.go b/pkg/clusteragent/admission/mutate/autoinstrumentation/auto_instrumentation.go
@@ -41,7 +41,7 @@ const (
 	// defaultMilliCPURequest defines default milli cpu request number.
 	defaultMilliCPURequest int64 = 50 // 0.05 core
 	// defaultMemoryRequest defines default memory request size.
-	defaultMemoryRequest int64 = 20 * 1024 * 1024 // 20 MB
+	defaultMemoryRequest int64 = 100 * 1024 * 1024 // 100 MB (recommended minimum by Alpine)
 
 	webhookName = "lib_injection"
 )

diff --git a/pkg/clusteragent/admission/mutate/autoinstrumentation/auto_instrumentation_test.go b/pkg/clusteragent/admission/mutate/autoinstrumentation/auto_instrumentation_test.go
@@ -1098,7 +1098,7 @@ func TestInjectLibInitContainer(t *testing.T) {
 			lang:    java,
 			wantErr: false,
 			wantCPU: "50m",
-			wantMem: "20Mi",
+			wantMem: "100Mi",
 			secCtx:  &corev1.SecurityContext{},
 		},
 		{
@@ -1121,7 +1121,7 @@ func TestInjectLibInitContainer(t *testing.T) {
 			lang:    java,
 			wantErr: false,
 			wantCPU: "200m",
-			wantMem: "20Mi",
+			wantMem: "100Mi",
 			secCtx:  &corev1.SecurityContext{},
 		},
 		{
@@ -1143,7 +1143,7 @@ func TestInjectLibInitContainer(t *testing.T) {
 			lang:    java,
 			wantErr: true,
 			wantCPU: "50m",
-			wantMem: "20Mi",
+			wantMem: "100Mi",
 			secCtx:  &corev1.SecurityContext{},
 		},
 		{
@@ -1153,7 +1153,7 @@ func TestInjectLibInitContainer(t *testing.T) {
 			lang:    java,
 			wantErr: false,
 			wantCPU: "50m",
-			wantMem: "20Mi",
+			wantMem: "100Mi",
 			secCtx: &corev1.SecurityContext{
 				Capabilities: &corev1.Capabilities{
 					Add:  []corev1.Capability{"NET_ADMIN", "SYS_TIME"},
@@ -1191,7 +1191,7 @@ func TestInjectLibInitContainer(t *testing.T) {
 			lang:    java,
 			wantErr: false,
 			wantCPU: "50m",
-			wantMem: "20Mi",
+			wantMem: "100Mi",
 			secCtx: &corev1.SecurityContext{
 				Capabilities: &corev1.Capabilities{
 					Drop: []corev1.Capability{"ALL"},

diff --git a/releasenotes/notes/auto-instrumentation-fix-memory-request-8391bb2d06ac6990.yaml b/releasenotes/notes/auto-instrumentation-fix-memory-request-8391bb2d06ac6990.yaml
@@ -0,0 +1,4 @@
+---
+fixes:
+  - |
+    Fix OOM error with cluster agent auto instrumentation by increasing default memory request from 20Mi to 100Mi.