more e2e test fixes... idk

Signed-off-by: Oliver Trosien <[email protected]>

Author: otrosien

cmd/e2e/test_utils.go

@@ -45,18 +45,18 @@ var (
 						},
 					},
 					Env: []v1.EnvVar{
-						{Name: "ES_JAVA_OPTS", Value: "-Xms560m -Xmx560m"},
+						{Name: "ES_JAVA_OPTS", Value: "-XX:MaxDirectMemorySize=10M -XX:MaxMetaspaceSize=155273K -XX:ReservedCodeCacheSize=240M -Xss1M -Xms684406K -Xmx684406K -XX:ActiveProcessorCount=2 -Xlog:gc"},
 						{Name: "node.roles", Value: "data"},
 						{Name: "node.attr.group", Value: nodeGroup},
 					},
 					Resources: v1.ResourceRequirements{
 						Limits: v1.ResourceList{
 							v1.ResourceMemory: resource.MustParse("1120Mi"),
-							v1.ResourceCPU:    resource.MustParse("1000m"),
+							v1.ResourceCPU:    resource.MustParse("2000m"),
 						},
 						Requests: v1.ResourceList{
 							v1.ResourceMemory: resource.MustParse("1120Mi"),
-							v1.ResourceCPU:    resource.MustParse("200m"),
+							v1.ResourceCPU:    resource.MustParse("50m"),
 						},
 					},
 					ReadinessProbe: &v1.Probe{

deploy/e2e/apply/es8-config.yaml

@@ -9,6 +9,20 @@ data:
     bootstrap.memory_lock: false
     discovery.seed_hosts: [es8-master]
     cluster.initial_master_nodes: [es8-master-0]
+    cluster.no_master_block: "write"
+    gateway.expected_data_nodes: 0
+    indices.breaker.total.use_real_memory: false
+    indices.lifecycle.history_index_enabled: false
+    slm.history_index_enabled: false
+    
+    # Disable X-Pack features
     xpack.security.enabled: false
     xpack.security.transport.ssl.enabled: false
     xpack.security.http.ssl.enabled: false
+    xpack.ml.enabled: false
+    xpack.watcher.enabled: false
+    xpack.graph.enabled: false
+    xpack.ccr.enabled: false
+
+    # Disable EQL
+    xpack.eql.enabled: false

deploy/e2e/apply/es8-master.yaml

@@ -25,18 +25,18 @@ spec:
         resources:
           requests:
             memory: 1120Mi
-            cpu: 100m
+            cpu: 50m
           limits:
             memory: 1120Mi
-            cpu: 100m
+            cpu: 2000m
         image: "docker.elastic.co/elasticsearch/elasticsearch:8.19.5"
         env:
         - name: "node.name"
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
         - name: "ES_JAVA_OPTS"
-          value: "-Xms560m -Xmx560m"
+          value: "-XX:MaxDirectMemorySize=10M -XX:MaxMetaspaceSize=155273K -XX:ReservedCodeCacheSize=240M -Xss1M -Xms684406K -Xmx684406K -XX:ActiveProcessorCount=2 -XX:+UseCompactObjectHeaders -Xlog:gc"
         - name: node.roles
           value: "master,data"
         readinessProbe:

deploy/e2e/apply/es9-config.yaml

@@ -9,6 +9,20 @@ data:
     bootstrap.memory_lock: false
     discovery.seed_hosts: [es9-master]
     cluster.initial_master_nodes: [es9-master-0]
+    cluster.no_master_block: "write"
+    gateway.expected_data_nodes: 0
+    indices.breaker.total.use_real_memory: false
+    indices.lifecycle.history_index_enabled: false
+    slm.history_index_enabled: false
+    
+    # Disable X-Pack features
     xpack.security.enabled: false
     xpack.security.transport.ssl.enabled: false
     xpack.security.http.ssl.enabled: false
+    xpack.ml.enabled: false
+    xpack.watcher.enabled: false
+    xpack.graph.enabled: false
+    xpack.ccr.enabled: false
+
+    # Disable EQL
+    xpack.eql.enabled: false

deploy/e2e/apply/es9-master.yaml

@@ -23,18 +23,18 @@ spec:
         resources:
           requests:
             memory: 1120Mi
-            cpu: 100m
+            cpu: 50m
           limits:
             memory: 1120Mi
-            cpu: 100m
+            cpu: 2000m
         image: "docker.elastic.co/elasticsearch/elasticsearch:9.1.5"
         env:
         - name: "node.name"
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
         - name: "ES_JAVA_OPTS"
-          value: "-Xmx560m -Xms560m"
+          value: "-XX:MaxDirectMemorySize=10M -XX:MaxMetaspaceSize=155273K -XX:ReservedCodeCacheSize=240M -Xss1M -Xms684406K -Xmx684406K -XX:ActiveProcessorCount=2 -XX:+UseCompactObjectHeaders -Xlog:gc"
         - name: node.roles
           value: "master,data"
         readinessProbe:

e2e.sh

@@ -47,6 +47,6 @@ ES_SERVICE_ENDPOINT_ES8=$SERVICE_ENDPOINT_ES8 \
     ES_SERVICE_ENDPOINT_ES9=$SERVICE_ENDPOINT_ES9 \
     E2E_NAMESPACE="$NAMESPACE" \
     OPERATOR_ID="$OPERATOR_ID" \
-    KUBECONFIG=~/.kube/config echo go test -v -parallel 64 ./cmd/e2e/...
+    KUBECONFIG=~/.kube/config go test -v -parallel 64 ./cmd/e2e/...
 
-# kubectl delete ns "$NAMESPACE"
+kubectl delete ns "$NAMESPACE"