[RORDEV-1941] Do not apply JDK patch, remove ROR <=1.64 fallbacks

environments/eck-ror/kind-cluster/ror/base/es.yml

@@ -18,12 +18,8 @@ spec:
                 runAsUser: 0
                 runAsGroup: 0
               env:
-                # For ROR_ES_VERSION >= 1.64.0
                 - name: I_UNDERSTAND_AND_ACCEPT_ES_PATCHING
                   value: "yes"
-                # For ROR_ES_VERSION < 1.64.0
-                - name: I_UNDERSTAND_IMPLICATION_OF_ES_PATCHING
-                  value: "yes"
                 - name: INTERNAL_USR_PASS
                   valueFrom:
                     secretKeyRef:

environments/eck-ror/start.sh

@@ -123,43 +123,12 @@ if [[ -z $ES_VERSION || -z $KBN_VERSION ]]; then
   show_help
 fi
 
-PATCH_SCRIPT_DIR="../common/images/es-jdk-patch"
-
-ES_IMAGE="${ROR_ES_REPO}:${ES_VERSION}-ror-${ROR_ES_VERSION}"
-KBN_IMAGE="${ROR_KBN_REPO}:${KBN_VERSION}-ror-${ROR_KBN_VERSION}"
-
-patch_es_image_if_needed() {
-  if ES_VERSION="$ES_VERSION" "$PATCH_SCRIPT_DIR/patch-es-jdk.sh" --check; then
-    echo "ES $ES_VERSION bundles a JDK with cgroup v2 bug (JDK-8287073). Building patched image..."
-    docker build \
-      --build-arg BASE_IMAGE="$ES_IMAGE" \
-      --build-arg ES_VERSION="$ES_VERSION" \
-      -t "$ES_IMAGE" \
-      "$PATCH_SCRIPT_DIR"
-    echo "Patched ES image built successfully: $ES_IMAGE"
-  fi
-}
-
-preload_images_into_kind() {
-  echo "Pre-loading ROR images into Kind cluster to avoid Docker Hub rate limits..."
-  docker pull "$ES_IMAGE" || { echo "Failed to pull ES image: $ES_IMAGE"; exit 1; }
-  kind load docker-image "$ES_IMAGE" --name eck-ror || { echo "Failed to load ES image into KinD cluster."; exit 1; }
-  echo "ES image loaded into KinD cluster: $ES_IMAGE"
-
-  docker pull "$KBN_IMAGE" || { echo "Failed to pull Kibana image: $KBN_IMAGE"; exit 1; }
-  kind load docker-image "$KBN_IMAGE" --name eck-ror || { echo "Failed to load Kibana image into KinD cluster."; exit 1; }
-  echo "Kibana image loaded into KinD cluster: $KBN_IMAGE"
-}
-
 echo "CONFIGURING K8S CLUSTER ..."
 kind create cluster --name eck-ror --config kind-cluster/kind-cluster-config.yml
 docker exec eck-ror-control-plane /bin/bash -c "sysctl -w vm.max_map_count=262144"
 docker exec eck-ror-worker        /bin/bash -c "sysctl -w vm.max_map_count=262144"
 docker exec eck-ror-worker2       /bin/bash -c "sysctl -w vm.max_map_count=262144"
 
-patch_es_image_if_needed
-preload_images_into_kind
-
 
 
 echo "CONFIGURING ECK $ECK_VERSION ..."

environments/elk-ror/base.docker-compose.yml

@@ -5,7 +5,9 @@ services:
       context: .
       dockerfile: images/es/Dockerfile
       args:
-        ES_PATCHED_IMAGE: $ES_PATCHED_IMAGE
+        ROR_ES_REPO: $ROR_ES_REPO
+        ES_VERSION: $ES_VERSION
+        ROR_ES_VERSION: $ROR_ES_VERSION
     ports:
       - "9200:9200"
       - "5005:5005"

environments/elk-ror/images/es/Dockerfile

@@ -1,6 +1,8 @@
-ARG ES_PATCHED_IMAGE
+ARG ROR_ES_REPO
+ARG ES_VERSION
+ARG ROR_ES_VERSION
 
-FROM ${ES_PATCHED_IMAGE}
+FROM ${ROR_ES_REPO}:${ES_VERSION}-ror-${ROR_ES_VERSION}
 
 USER elasticsearch
 
@@ -12,8 +14,5 @@ COPY certs/elasticsearch.crt /usr/share/elasticsearch/config/elasticsearch.crt
 COPY certs/elasticsearch.csr /usr/share/elasticsearch/config/elasticsearch.csr
 COPY certs/elasticsearch.key /usr/share/elasticsearch/config/elasticsearch.key
 
-# For ROR_ES_VERSION >= 1.64.0
 ENV I_UNDERSTAND_AND_ACCEPT_ES_PATCHING yes
-# For ROR_ES_VERSION < 1.64.0
-ENV I_UNDERSTAND_IMPLICATION_OF_ES_PATCHING yes
 USER root

environments/elk-ror/start.sh

@@ -116,13 +116,14 @@ if [[ -z $ES_VERSION || -z $KBN_VERSION ]]; then
   show_help
 fi
 
-echo "Building JDK-patched ES base image ..."
-export ES_PATCHED_IMAGE="es-ror-patched:${ES_VERSION}"
-docker build \
-  --build-arg BASE_IMAGE="${ROR_ES_REPO}:${ES_VERSION}-ror-${ROR_ES_VERSION}" \
-  --build-arg ES_VERSION="$ES_VERSION" \
-  -t "$ES_PATCHED_IMAGE" \
-  ../common/images/es-jdk-patch/
+ROR_ES_IMAGE="${ROR_ES_REPO}:${ES_VERSION}-ror-${ROR_ES_VERSION}"
+ROR_KBN_IMAGE="${ROR_KBN_REPO}:${KBN_VERSION}-ror-${ROR_KBN_VERSION}"
+
+echo "Pre-pulling ES image $ROR_ES_IMAGE ..."
+docker pull "$ROR_ES_IMAGE" || { echo "Failed to pull ES image: $ROR_ES_IMAGE"; exit 1; }
+
+echo "Pre-pulling Kibana image $ROR_KBN_IMAGE ..."
+docker pull "$ROR_KBN_IMAGE" || { echo "Failed to pull Kibana image: $ROR_KBN_IMAGE"; exit 1; }
 
 echo "Bootstrapping the docker-based environment ..."
 echo "Cluster type: $CLUSTER_TYPE"