This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git


The following commit(s) were added to refs/heads/master by this push:
     new 92a8f5d3c1 Drop ES 7 (EOL) and upgrade all Elasticsearch E2E tests to 
8.18.8 (#13715)
92a8f5d3c1 is described below

commit 92a8f5d3c1ad2c904fd51cb243548544658b11b3
Author: 吴晟 Wu Sheng <[email protected]>
AuthorDate: Fri Feb 27 12:27:50 2026 +0800

    Drop ES 7 (EOL) and upgrade all Elasticsearch E2E tests to 8.18.8 (#13715)
    
    * Drop ES 7 (EOL) and upgrade all Elasticsearch E2E tests to 8.18.8
    * Add xpack.security.enabled=false for ES 8 docker-compose files
    
    ES 8 enables security by default, unlike ES 7. The 12 docker-compose
    files that were upgraded from ES 7.15.0 to 8.18.8 need this setting
    explicitly disabled for the E2E tests to connect without authentication.
    
    * Install ECK operator before SkyWalking helm chart for ES-based K8s tests
    
    The new skywalking-helm chart uses ECK (Elastic Cloud on Kubernetes) CRDs
    to deploy Elasticsearch, replacing the old StatefulSet-based approach.
    The ECK operator must be installed first so the Elasticsearch CRD is
    available when the skywalking chart is applied.
    
    For each ES-based K8s E2E test:
    - Add "Install ECK operator" step that pulls the chart, extracts the
      bundled eck-operator subchart, installs it, and waits for readiness
    - Add --set eckOperator.enabled=false to skip the bundled operator
      (already installed separately)
    - Remove obsolete elasticsearch.replicas/minimumMasterNodes settings
    - Add `helm dep up skywalking-helm` after `helm pull --untar` in all 13
      Helm-based e2e.yaml files. The OCI chart package does not include
      pre-packaged subchart .tgz files in charts/, so `helm dep up` is
      needed to download the eck-operator subchart dependency before
      installing it.
    - Remove OpenSearch 1.x test entries (Storage 1.3.10, Trace Profiling
      1.1.0/1.3.6, Zipkin 1.2.0, UI Menu 1.1.0/1.3.6) from CI workflow.
      Keep OpenSearch 2.x and 3.x tests.
---
 .github/workflows/skywalking.yaml                  | 71 +++-------------------
 docs/en/changes/changes.md                         |  1 +
 test/e2e-v2/cases/alarm/es/docker-compose.yml      |  3 +-
 .../cases/alarm/es/es-sharding/docker-compose.yml  |  3 +-
 test/e2e-v2/cases/baseline/es/docker-compose.yml   |  3 +-
 .../baseline/es/es-sharding/docker-compose.yml     |  3 +-
 test/e2e-v2/cases/browser/es/docker-compose.yml    |  2 +-
 .../browser/es/es-sharding/docker-compose.yml      |  2 +-
 test/e2e-v2/cases/cilium/e2e.yaml                  | 11 +++-
 test/e2e-v2/cases/cluster/zk/es/docker-compose.yml |  3 +-
 test/e2e-v2/cases/elasticsearch/docker-compose.yml |  2 +-
 test/e2e-v2/cases/event/es/docker-compose.yml      |  3 +-
 test/e2e-v2/cases/istio/als/e2e.yaml               | 11 +++-
 test/e2e-v2/cases/istio/ambient-als/e2e.yaml       | 11 +++-
 test/e2e-v2/cases/istio/metrics/e2e.yaml           | 11 +++-
 test/e2e-v2/cases/logql/docker-compose.yml         |  2 +-
 test/e2e-v2/cases/menu/es/docker-compose.yml       |  3 +-
 .../cases/menu/es/es-sharding/docker-compose.yml   |  3 +-
 .../profiling/async-profiler/es/docker-compose.yml |  3 +-
 .../cases/profiling/ebpf/access_log/es/e2e.yaml    | 12 +++-
 .../ebpf/access_log/es/es-sharding/e2e.yaml        | 12 +++-
 .../cases/profiling/ebpf/continuous/es/e2e.yaml    | 12 +++-
 .../ebpf/continuous/es/es-sharding/e2e.yaml        | 12 +++-
 .../cases/profiling/ebpf/network/es/e2e.yaml       | 12 +++-
 .../profiling/ebpf/network/es/es-sharding/e2e.yaml | 12 +++-
 test/e2e-v2/cases/profiling/ebpf/oncpu/es/e2e.yaml | 12 +++-
 .../profiling/ebpf/oncpu/es/es-sharding/e2e.yaml   | 12 +++-
 .../cases/profiling/pprof/es/docker-compose.yml    |  3 +-
 .../cases/profiling/trace/es/docker-compose.yml    |  3 +-
 .../trace/es/es-sharding/docker-compose.yml        |  3 +-
 test/e2e-v2/cases/rover/process/istio/e2e.yaml     | 11 +++-
 .../storage/es/es-sharding/docker-compose.yml      |  2 +-
 test/e2e-v2/cases/zipkin/es/docker-compose.yml     |  2 +-
 .../cases/zipkin/es/es-sharding/docker-compose.yml |  2 +-
 test/e2e-v2/script/env                             |  2 +-
 35 files changed, 160 insertions(+), 115 deletions(-)

diff --git a/.github/workflows/skywalking.yaml 
b/.github/workflows/skywalking.yaml
index 1b49f2fae8..46d8e0142c 100644
--- a/.github/workflows/skywalking.yaml
+++ b/.github/workflows/skywalking.yaml
@@ -376,24 +376,9 @@ jobs:
             config: test/e2e-v2/cases/storage/mysql/e2e.yaml
           - name: Storage PostgreSQL
             config: test/e2e-v2/cases/storage/postgres/e2e.yaml
-          - name: Storage ES 7.16.3
+          - name: Storage ES 8.18.8
             config: test/e2e-v2/cases/storage/es/e2e.yaml
-            env: ES_VERSION=7.16.3
-          - name: Storage ES 7.17.10
-            config: test/e2e-v2/cases/storage/es/e2e.yaml
-            env: ES_VERSION=7.17.10
-          - name: Storage ES 8.1.0
-            config: test/e2e-v2/cases/storage/es/e2e.yaml
-            env: ES_VERSION=8.1.0
-          - name: Storage ES 8.9.0
-            config: test/e2e-v2/cases/storage/es/e2e.yaml
-            env: ES_VERSION=8.9.0
-          - name: Storage ES 8.9.0
-            config: test/e2e-v2/cases/storage/es/e2e.yaml
-            env: ES_VERSION=8.18.1
-          - name: Storage OpenSearch 1.3.10
-            config: test/e2e-v2/cases/storage/opensearch/e2e.yaml
-            env: OPENSEARCH_VERSION=1.3.10
+            env: ES_VERSION=8.18.8
           - name: Storage OpenSearch 2.4.0
             config: test/e2e-v2/cases/storage/opensearch/e2e.yaml
             env: OPENSEARCH_VERSION=2.4.0
@@ -424,15 +409,9 @@ jobs:
           - name: Baseline-driven Alarm BanyanDB
             config: test/e2e-v2/cases/baseline/banyandb/e2e.yaml
 
-          - name: TTL ES 7.16.3
+          - name: TTL ES 8.18.8
             config: test/e2e-v2/cases/ttl/es/e2e.yaml
-            env: ES_VERSION=7.16.3
-          - name: TTL ES 8.8.1
-            config: test/e2e-v2/cases/ttl/es/e2e.yaml
-            env: ES_VERSION=8.8.1
-          - name: TTL ES 8.18.1
-            config: test/e2e-v2/cases/ttl/es/e2e.yaml
-            env: ES_VERSION=8.18.1
+            env: ES_VERSION=8.18.8
 
           - name: Event BanyanDB
             config: test/e2e-v2/cases/event/banyandb/e2e.yaml
@@ -445,33 +424,18 @@ jobs:
             config: test/e2e-v2/cases/log/mysql/e2e.yaml
           - name: Log PostgreSQL
             config: test/e2e-v2/cases/log/postgres/e2e.yaml
-          - name: Log ES 7.16.3
+          - name: Log ES 8.18.8
             config: test/e2e-v2/cases/log/es/e2e.yaml
-            env: ES_VERSION=7.16.3
-          - name: Log ES 7.17.10
-            config: test/e2e-v2/cases/log/es/e2e.yaml
-            env: ES_VERSION=7.17.10
-          - name: Log ES 8.8.1 Sharding
-            config: test/e2e-v2/cases/log/es/es-sharding/e2e.yaml
-            env: ES_VERSION=8.8.1
-          - name: Log ES 8.18.1 Sharding
+            env: ES_VERSION=8.18.8
+          - name: Log ES 8.18.8 Sharding
             config: test/e2e-v2/cases/log/es/es-sharding/e2e.yaml
-            env: ES_VERSION=8.18.1
+            env: ES_VERSION=8.18.8
           - name: Log BanyanDB
             config: test/e2e-v2/cases/log/banyandb/e2e.yaml
 
-          - name: Log FluentBit ES 7.16.3
+          - name: Log FluentBit ES 8.18.8
             config: test/e2e-v2/cases/log/fluent-bit/e2e.yaml
-            env: ES_VERSION=7.16.3
-          - name: Log FluentBit ES 7.17.10
-            config: test/e2e-v2/cases/log/fluent-bit/e2e.yaml
-            env: ES_VERSION=7.17.10
-          - name: Log FluentBit ES 8.8.1
-            config: test/e2e-v2/cases/log/fluent-bit/e2e.yaml
-            env: ES_VERSION=8.8.1
-          - name: Log FluentBit ES 8.18.1
-            config: test/e2e-v2/cases/log/fluent-bit/e2e.yaml
-            env: ES_VERSION=8.18.1
+            env: ES_VERSION=8.18.8
 
           - name: Trace Profiling BanyanDB
             config: test/e2e-v2/cases/profiling/trace/banyandb/e2e.yaml
@@ -483,16 +447,9 @@ jobs:
             config: test/e2e-v2/cases/profiling/trace/mysql/e2e.yaml
           - name: Trace Profiling Postgres
             config: test/e2e-v2/cases/profiling/trace/postgres/e2e.yaml
-          - name: Trace Profiling OpenSearch 1.1.0
-            config: test/e2e-v2/cases/profiling/trace/opensearch/e2e.yaml
-            env: OPENSEARCH_VERSION=1.1.0
-          - name: Trace Profiling OpenSearch 1.3.6
-            config: test/e2e-v2/cases/profiling/trace/opensearch/e2e.yaml
-            env: OPENSEARCH_VERSION=1.3.6
           - name: Trace Profiling OpenSearch 2.4.0
             config: test/e2e-v2/cases/profiling/trace/opensearch/e2e.yaml
             env: OPENSEARCH_VERSION=2.4.0
-
           - name: Go Trace Profiling
             config: test/e2e-v2/cases/profiling/trace/go/e2e.yaml
 
@@ -641,8 +598,6 @@ jobs:
             config: test/e2e-v2/cases/zipkin/es/es-sharding/e2e.yaml
           - name: Zipkin MySQL
             config: test/e2e-v2/cases/zipkin/mysql/e2e.yaml
-          - name: Zipkin Opensearch
-            config: test/e2e-v2/cases/zipkin/opensearch/e2e.yaml
           - name: Zipkin Postgres
             config: test/e2e-v2/cases/zipkin/postgres/e2e.yaml
           - name: Zipkin Kafka
@@ -707,12 +662,6 @@ jobs:
             config: test/e2e-v2/cases/menu/mysql/e2e.yaml
           - name: UI Menu Postgres
             config: test/e2e-v2/cases/menu/postgres/e2e.yaml
-          - name: UI Menu OpenSearch 1.1.0
-            config: test/e2e-v2/cases/menu/opensearch/e2e.yaml
-            env: OPENSEARCH_VERSION=1.1.0
-          - name: UI Menu OpenSearch 1.3.6
-            config: test/e2e-v2/cases/menu/opensearch/e2e.yaml
-            env: OPENSEARCH_VERSION=1.3.6
           - name: UI Menu OpenSearch 2.4.0
             config: test/e2e-v2/cases/menu/opensearch/e2e.yaml
             env: OPENSEARCH_VERSION=2.4.0
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 024e752630..f400946bc0 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -12,6 +12,7 @@
 * Add `CLAUDE.md` as AI assistant guide for the project.
 * Upgrade Groovy to 5.0.3 in OAP backend.
 * Bump up nodejs to v24.13.0 for the latest UI(booster-ui) compiling.
+* Drop Elasticsearch 7.x (EOL) and OpenSearch 1.x from E2E tests, upgrade all 
ES tests to 8.18.8, and update skywalking-helm to use ECK 8.18.8.
 * Add `library-batch-queue` module — a partitioned, self-draining queue with 
type-based dispatch,
   adaptive partitioning, idle backoff, and throughput-weighted drain 
rebalancing (`DrainBalancer`).
   Designed to replace DataCarrier in high-fan-out scenarios.
diff --git a/test/e2e-v2/cases/alarm/es/docker-compose.yml 
b/test/e2e-v2/cases/alarm/es/docker-compose.yml
index 4e5862e90d..fd9ed27296 100644
--- a/test/e2e-v2/cases/alarm/es/docker-compose.yml
+++ b/test/e2e-v2/cases/alarm/es/docker-compose.yml
@@ -17,13 +17,14 @@ version: '2.1'
 
 services:
   es:
-    image: elastic/elasticsearch:7.15.0
+    image: elastic/elasticsearch:8.18.8
     expose:
       - 9200
     networks:
       - e2e
     environment:
       - discovery.type=single-node
+      - xpack.security.enabled=false
     healthcheck:
       test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9200"]
       interval: 5s
diff --git a/test/e2e-v2/cases/alarm/es/es-sharding/docker-compose.yml 
b/test/e2e-v2/cases/alarm/es/es-sharding/docker-compose.yml
index c009c55292..aa79e2efd4 100644
--- a/test/e2e-v2/cases/alarm/es/es-sharding/docker-compose.yml
+++ b/test/e2e-v2/cases/alarm/es/es-sharding/docker-compose.yml
@@ -17,13 +17,14 @@ version: '2.1'
 
 services:
   es:
-    image: elastic/elasticsearch:7.15.0
+    image: elastic/elasticsearch:8.18.8
     expose:
       - 9200
     networks:
       - e2e
     environment:
       - discovery.type=single-node
+      - xpack.security.enabled=false
     healthcheck:
       test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9200"]
       interval: 5s
diff --git a/test/e2e-v2/cases/baseline/es/docker-compose.yml 
b/test/e2e-v2/cases/baseline/es/docker-compose.yml
index 444c43e2c2..f4dcf95378 100644
--- a/test/e2e-v2/cases/baseline/es/docker-compose.yml
+++ b/test/e2e-v2/cases/baseline/es/docker-compose.yml
@@ -17,13 +17,14 @@ version: '2.1'
 
 services:
   es:
-    image: elastic/elasticsearch:7.15.0
+    image: elastic/elasticsearch:8.18.8
     expose:
       - 9200
     networks:
       - e2e
     environment:
       - discovery.type=single-node
+      - xpack.security.enabled=false
     healthcheck:
       test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9200"]
       interval: 5s
diff --git a/test/e2e-v2/cases/baseline/es/es-sharding/docker-compose.yml 
b/test/e2e-v2/cases/baseline/es/es-sharding/docker-compose.yml
index 553bd81479..e247fbe481 100644
--- a/test/e2e-v2/cases/baseline/es/es-sharding/docker-compose.yml
+++ b/test/e2e-v2/cases/baseline/es/es-sharding/docker-compose.yml
@@ -17,13 +17,14 @@ version: '2.1'
 
 services:
   es:
-    image: elastic/elasticsearch:7.15.0
+    image: elastic/elasticsearch:8.18.8
     expose:
       - 9200
     networks:
       - e2e
     environment:
       - discovery.type=single-node
+      - xpack.security.enabled=false
     healthcheck:
       test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9200"]
       interval: 5s
diff --git a/test/e2e-v2/cases/browser/es/docker-compose.yml 
b/test/e2e-v2/cases/browser/es/docker-compose.yml
index f52b49b809..0c009a2e83 100644
--- a/test/e2e-v2/cases/browser/es/docker-compose.yml
+++ b/test/e2e-v2/cases/browser/es/docker-compose.yml
@@ -17,7 +17,7 @@ version: '2.1'
 
 services:
   es:
-    image: elastic/elasticsearch:7.15.0
+    image: elastic/elasticsearch:8.18.8
     expose:
       - 9200
     networks:
diff --git a/test/e2e-v2/cases/browser/es/es-sharding/docker-compose.yml 
b/test/e2e-v2/cases/browser/es/es-sharding/docker-compose.yml
index 59c9830f0e..45198e2c42 100644
--- a/test/e2e-v2/cases/browser/es/es-sharding/docker-compose.yml
+++ b/test/e2e-v2/cases/browser/es/es-sharding/docker-compose.yml
@@ -17,7 +17,7 @@ version: '2.1'
 
 services:
   es:
-    image: elastic/elasticsearch:7.15.0
+    image: elastic/elasticsearch:8.18.8
     expose:
       - 9200
     networks:
diff --git a/test/e2e-v2/cases/cilium/e2e.yaml 
b/test/e2e-v2/cases/cilium/e2e.yaml
index 9c05a267d7..f3f19dab34 100644
--- a/test/e2e-v2/cases/cilium/e2e.yaml
+++ b/test/e2e-v2/cases/cilium/e2e.yaml
@@ -47,14 +47,21 @@ setup:
         bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh cilium
         cilium install --wait
         cilium status --wait
+    - name: Install ECK operator
+      command: |
+        helm pull oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
+          --version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" --untar
+        helm dep up skywalking-helm
+        helm -n kube-system install eck-operator 
skywalking-helm/charts/eck-operator-*.tgz \
+          --create-namespace
+        kubectl -n kube-system rollout status --watch --timeout=120s 
statefulset/elastic-operator
     - name: Install SkyWalking
       command: |
         helm -n kube-system install skywalking \
           oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
           --version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" \
           --set fullnameOverride=skywalking \
-          --set elasticsearch.replicas=1 \
-          --set elasticsearch.minimumMasterNodes=1 \
+          --set eckOperator.enabled=false \
           --set oap.replicas=1 \
           --set ui.image.repository=skywalking/ui \
           --set ui.image.tag=latest \
diff --git a/test/e2e-v2/cases/cluster/zk/es/docker-compose.yml 
b/test/e2e-v2/cases/cluster/zk/es/docker-compose.yml
index 5d8e4e9f03..8c62c28a1d 100644
--- a/test/e2e-v2/cases/cluster/zk/es/docker-compose.yml
+++ b/test/e2e-v2/cases/cluster/zk/es/docker-compose.yml
@@ -29,13 +29,14 @@ services:
       retries: 120
 
   es:
-    image: elastic/elasticsearch:7.15.0
+    image: elastic/elasticsearch:8.18.8
     expose:
       - 9200
     networks:
       - e2e
     environment:
       - discovery.type=single-node
+      - xpack.security.enabled=false
       - cluster.routing.allocation.disk.threshold_enabled=false
     healthcheck:
       test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9200"]
diff --git a/test/e2e-v2/cases/elasticsearch/docker-compose.yml 
b/test/e2e-v2/cases/elasticsearch/docker-compose.yml
index a698f17ed7..8204988592 100644
--- a/test/e2e-v2/cases/elasticsearch/docker-compose.yml
+++ b/test/e2e-v2/cases/elasticsearch/docker-compose.yml
@@ -31,7 +31,7 @@ services:
     ports:
       - 17912
   es:
-    image: elastic/elasticsearch:8.3.2
+    image: elastic/elasticsearch:8.18.8
     expose:
       - 9200
     networks:
diff --git a/test/e2e-v2/cases/event/es/docker-compose.yml 
b/test/e2e-v2/cases/event/es/docker-compose.yml
index 8413ec3fc1..0cc10dfb66 100644
--- a/test/e2e-v2/cases/event/es/docker-compose.yml
+++ b/test/e2e-v2/cases/event/es/docker-compose.yml
@@ -17,13 +17,14 @@ version: '3.8'
 
 services:
   es:
-    image: elastic/elasticsearch:7.15.0
+    image: elastic/elasticsearch:8.18.8
     expose:
       - 9200
     networks:
       - e2e
     environment:
       - discovery.type=single-node
+      - xpack.security.enabled=false
       - cluster.routing.allocation.disk.threshold_enabled=false
     healthcheck:
       test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9200"]
diff --git a/test/e2e-v2/cases/istio/als/e2e.yaml 
b/test/e2e-v2/cases/istio/als/e2e.yaml
index 6dd855eb87..cd7957e886 100644
--- a/test/e2e-v2/cases/istio/als/e2e.yaml
+++ b/test/e2e-v2/cases/istio/als/e2e.yaml
@@ -45,14 +45,21 @@ setup:
         kubectl label namespace default istio-injection=enabled
     - name: Install helm
       command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh helm
+    - name: Install ECK operator
+      command: |
+        helm pull oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
+          --version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" --untar
+        helm dep up skywalking-helm
+        helm -n istio-system install eck-operator 
skywalking-helm/charts/eck-operator-*.tgz \
+          --create-namespace
+        kubectl -n istio-system rollout status --watch --timeout=120s 
statefulset/elastic-operator
     - name: Install SkyWalking
       command: |
         helm -n istio-system install skywalking \
           oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
           --version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" \
           --set fullnameOverride=skywalking \
-          --set elasticsearch.replicas=1 \
-          --set elasticsearch.minimumMasterNodes=1 \
+          --set eckOperator.enabled=false \
           --set oap.env.SW_ENVOY_METRIC_ALS_HTTP_ANALYSIS=$ALS_ANALYZER \
           --set oap.env.SW_ENVOY_METRIC_ALS_TCP_ANALYSIS=$ALS_ANALYZER \
           --set oap.env.K8S_SERVICE_NAME_RULE='e2e::${service.metadata.name}' \
diff --git a/test/e2e-v2/cases/istio/ambient-als/e2e.yaml 
b/test/e2e-v2/cases/istio/ambient-als/e2e.yaml
index d0c95405e1..11c203b2ee 100644
--- a/test/e2e-v2/cases/istio/ambient-als/e2e.yaml
+++ b/test/e2e-v2/cases/istio/ambient-als/e2e.yaml
@@ -53,14 +53,21 @@ setup:
           for: condition=available
     - name: Install helm
       command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh helm
+    - name: Install ECK operator
+      command: |
+        helm pull oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
+          --version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" --untar
+        helm dep up skywalking-helm
+        helm -n istio-system install eck-operator 
skywalking-helm/charts/eck-operator-*.tgz \
+          --create-namespace
+        kubectl -n istio-system rollout status --watch --timeout=120s 
statefulset/elastic-operator
     - name: Install SkyWalking
       command: |
         helm -n istio-system install skywalking \
           oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
           --version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" \
           --set fullnameOverride=skywalking \
-          --set elasticsearch.replicas=1 \
-          --set elasticsearch.minimumMasterNodes=1 \
+          --set eckOperator.enabled=false \
           --set oap.env.SW_ENVOY_METRIC_ALS_HTTP_ANALYSIS=$ALS_ANALYZER \
           --set oap.env.SW_ENVOY_METRIC_ALS_TCP_ANALYSIS=$ALS_ANALYZER \
           --set oap.env.K8S_SERVICE_NAME_RULE='e2e::${service.metadata.name}' \
diff --git a/test/e2e-v2/cases/istio/metrics/e2e.yaml 
b/test/e2e-v2/cases/istio/metrics/e2e.yaml
index f9e786b846..f11d083caf 100644
--- a/test/e2e-v2/cases/istio/metrics/e2e.yaml
+++ b/test/e2e-v2/cases/istio/metrics/e2e.yaml
@@ -55,14 +55,21 @@ setup:
       command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh helm
     - name: Install kubectl
       command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh 
kubectl
+    - name: Install ECK operator
+      command: |
+        helm pull oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
+          --version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" --untar
+        helm dep up skywalking-helm
+        helm -n istio-system install eck-operator 
skywalking-helm/charts/eck-operator-*.tgz \
+          --create-namespace
+        kubectl -n istio-system rollout status --watch --timeout=120s 
statefulset/elastic-operator
     - name: Install SkyWalking
       command: |
         helm -n istio-system install skywalking \
           oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
           --version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" \
           --set fullnameOverride=skywalking \
-          --set elasticsearch.replicas=1 \
-          --set elasticsearch.minimumMasterNodes=1 \
+          --set eckOperator.enabled=false \
           --set oap.env.SW_ENVOY_METRIC_ALS_HTTP_ANALYSIS=$ALS_ANALYZER \
           --set oap.env.SW_ENVOY_METRIC_ALS_TCP_ANALYSIS=$ALS_ANALYZER \
           --set oap.env.K8S_SERVICE_NAME_RULE='e2e::${service.metadata.name}' \
diff --git a/test/e2e-v2/cases/logql/docker-compose.yml 
b/test/e2e-v2/cases/logql/docker-compose.yml
index c078942b91..8c586fc30c 100644
--- a/test/e2e-v2/cases/logql/docker-compose.yml
+++ b/test/e2e-v2/cases/logql/docker-compose.yml
@@ -70,7 +70,7 @@ services:
         condition: service_healthy
 
   es:
-    image: elastic/elasticsearch:7.10.2
+    image: elastic/elasticsearch:8.18.8
     ports:
       - 9200
     networks:
diff --git a/test/e2e-v2/cases/menu/es/docker-compose.yml 
b/test/e2e-v2/cases/menu/es/docker-compose.yml
index 99ae297c3c..bb1f387546 100644
--- a/test/e2e-v2/cases/menu/es/docker-compose.yml
+++ b/test/e2e-v2/cases/menu/es/docker-compose.yml
@@ -17,13 +17,14 @@ version: '2.1'
 
 services:
   es:
-    image: elastic/elasticsearch:7.15.0
+    image: elastic/elasticsearch:8.18.8
     expose:
       - 9200
     networks:
       - e2e
     environment:
       - discovery.type=single-node
+      - xpack.security.enabled=false
       - cluster.routing.allocation.disk.threshold_enabled=false
     healthcheck:
       test: [ "CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9200" 
]
diff --git a/test/e2e-v2/cases/menu/es/es-sharding/docker-compose.yml 
b/test/e2e-v2/cases/menu/es/es-sharding/docker-compose.yml
index 28a583874a..3e038bc839 100644
--- a/test/e2e-v2/cases/menu/es/es-sharding/docker-compose.yml
+++ b/test/e2e-v2/cases/menu/es/es-sharding/docker-compose.yml
@@ -17,13 +17,14 @@ version: '2.1'
 
 services:
   es:
-    image: elastic/elasticsearch:7.15.0
+    image: elastic/elasticsearch:8.18.8
     expose:
       - 9200
     networks:
       - e2e
     environment:
       - discovery.type=single-node
+      - xpack.security.enabled=false
       - cluster.routing.allocation.disk.threshold_enabled=false
     healthcheck:
       test: [ "CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9200" 
]
diff --git a/test/e2e-v2/cases/profiling/async-profiler/es/docker-compose.yml 
b/test/e2e-v2/cases/profiling/async-profiler/es/docker-compose.yml
index 916ad2903f..9c4b0885b1 100644
--- a/test/e2e-v2/cases/profiling/async-profiler/es/docker-compose.yml
+++ b/test/e2e-v2/cases/profiling/async-profiler/es/docker-compose.yml
@@ -17,13 +17,14 @@ version: '3.8'
 
 services:
   es:
-    image: elastic/elasticsearch:7.15.0
+    image: elastic/elasticsearch:8.18.8
     expose:
       - 9200
     networks:
       - e2e
     environment:
       - discovery.type=single-node
+      - xpack.security.enabled=false
       - cluster.routing.allocation.disk.threshold_enabled=false
     healthcheck:
       test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9200"]
diff --git a/test/e2e-v2/cases/profiling/ebpf/access_log/es/e2e.yaml 
b/test/e2e-v2/cases/profiling/ebpf/access_log/es/e2e.yaml
index cc3751650d..12864218c4 100644
--- a/test/e2e-v2/cases/profiling/ebpf/access_log/es/e2e.yaml
+++ b/test/e2e-v2/cases/profiling/ebpf/access_log/es/e2e.yaml
@@ -40,15 +40,21 @@ setup:
       command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh helm
     - name: Install kubectl
       command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh 
kubectl
-    - name: Install SkyWalking
+    - name: Install ECK operator
       command: |
         kubectl create namespace istio-system
+        helm pull oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
+          --version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" --untar
+        helm dep up skywalking-helm
+        helm -n istio-system install eck-operator 
skywalking-helm/charts/eck-operator-*.tgz
+        kubectl -n istio-system rollout status --watch --timeout=120s 
statefulset/elastic-operator
+    - name: Install SkyWalking
+      command: |
         helm -n istio-system install skywalking \
           oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
           --version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" \
           --set fullnameOverride=skywalking \
-          --set elasticsearch.replicas=1 \
-          --set elasticsearch.minimumMasterNodes=1 \
+          --set eckOperator.enabled=false \
           --set oap.replicas=1 \
           --set ui.image.repository=skywalking/ui \
           --set ui.image.tag=latest \
diff --git 
a/test/e2e-v2/cases/profiling/ebpf/access_log/es/es-sharding/e2e.yaml 
b/test/e2e-v2/cases/profiling/ebpf/access_log/es/es-sharding/e2e.yaml
index 32a3d8738b..bfc66e8c35 100644
--- a/test/e2e-v2/cases/profiling/ebpf/access_log/es/es-sharding/e2e.yaml
+++ b/test/e2e-v2/cases/profiling/ebpf/access_log/es/es-sharding/e2e.yaml
@@ -40,15 +40,21 @@ setup:
       command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh helm
     - name: Install kubectl
       command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh 
kubectl
-    - name: Install SkyWalking
+    - name: Install ECK operator
       command: |
         kubectl create namespace istio-system
+        helm pull oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
+          --version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" --untar
+        helm dep up skywalking-helm
+        helm -n istio-system install eck-operator 
skywalking-helm/charts/eck-operator-*.tgz
+        kubectl -n istio-system rollout status --watch --timeout=120s 
statefulset/elastic-operator
+    - name: Install SkyWalking
+      command: |
         helm -n istio-system install skywalking \
           oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
           --version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" \
           --set fullnameOverride=skywalking \
-          --set elasticsearch.replicas=1 \
-          --set elasticsearch.minimumMasterNodes=1 \
+          --set eckOperator.enabled=false \
           --set oap.replicas=1 \
           --set ui.image.repository=skywalking/ui \
           --set ui.image.tag=latest \
diff --git a/test/e2e-v2/cases/profiling/ebpf/continuous/es/e2e.yaml 
b/test/e2e-v2/cases/profiling/ebpf/continuous/es/e2e.yaml
index 6baf91f525..b411bb9f7b 100644
--- a/test/e2e-v2/cases/profiling/ebpf/continuous/es/e2e.yaml
+++ b/test/e2e-v2/cases/profiling/ebpf/continuous/es/e2e.yaml
@@ -41,15 +41,21 @@ setup:
       command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh helm
     - name: Install kubectl
       command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh 
kubectl
-    - name: Install SkyWalking
+    - name: Install ECK operator
       command: |
         kubectl create namespace istio-system
+        helm pull oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
+          --version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" --untar
+        helm dep up skywalking-helm
+        helm -n istio-system install eck-operator 
skywalking-helm/charts/eck-operator-*.tgz
+        kubectl -n istio-system rollout status --watch --timeout=120s 
statefulset/elastic-operator
+    - name: Install SkyWalking
+      command: |
         helm -n istio-system install skywalking \
           oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
           --version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" \
           --set fullnameOverride=skywalking \
-          --set elasticsearch.replicas=1 \
-          --set elasticsearch.minimumMasterNodes=1 \
+          --set eckOperator.enabled=false \
           --set oap.replicas=1 \
           --set ui.image.repository=skywalking/ui \
           --set ui.image.tag=latest \
diff --git 
a/test/e2e-v2/cases/profiling/ebpf/continuous/es/es-sharding/e2e.yaml 
b/test/e2e-v2/cases/profiling/ebpf/continuous/es/es-sharding/e2e.yaml
index 6aa9e6e524..f38e4d12c9 100644
--- a/test/e2e-v2/cases/profiling/ebpf/continuous/es/es-sharding/e2e.yaml
+++ b/test/e2e-v2/cases/profiling/ebpf/continuous/es/es-sharding/e2e.yaml
@@ -41,15 +41,21 @@ setup:
       command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh helm
     - name: Install kubectl
       command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh 
kubectl
-    - name: Install SkyWalking
+    - name: Install ECK operator
       command: |
         kubectl create namespace istio-system
+        helm pull oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
+          --version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" --untar
+        helm dep up skywalking-helm
+        helm -n istio-system install eck-operator 
skywalking-helm/charts/eck-operator-*.tgz
+        kubectl -n istio-system rollout status --watch --timeout=120s 
statefulset/elastic-operator
+    - name: Install SkyWalking
+      command: |
         helm -n istio-system install skywalking \
           oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
           --version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" \
           --set fullnameOverride=skywalking \
-          --set elasticsearch.replicas=1 \
-          --set elasticsearch.minimumMasterNodes=1 \
+          --set eckOperator.enabled=false \
           --set oap.replicas=1 \
           --set ui.image.repository=skywalking/ui \
           --set ui.image.tag=latest \
diff --git a/test/e2e-v2/cases/profiling/ebpf/network/es/e2e.yaml 
b/test/e2e-v2/cases/profiling/ebpf/network/es/e2e.yaml
index 4f05c0d2ac..c3d95d7943 100644
--- a/test/e2e-v2/cases/profiling/ebpf/network/es/e2e.yaml
+++ b/test/e2e-v2/cases/profiling/ebpf/network/es/e2e.yaml
@@ -45,15 +45,21 @@ setup:
       command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh helm
     - name: Install kubectl
       command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh 
kubectl
-    - name: Install SkyWalking
+    - name: Install ECK operator
       command: |
         kubectl create namespace istio-system
+        helm pull oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
+          --version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" --untar
+        helm dep up skywalking-helm
+        helm -n istio-system install eck-operator 
skywalking-helm/charts/eck-operator-*.tgz
+        kubectl -n istio-system rollout status --watch --timeout=120s 
statefulset/elastic-operator
+    - name: Install SkyWalking
+      command: |
         helm -n istio-system install skywalking \
           oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
           --version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" \
           --set fullnameOverride=skywalking \
-          --set elasticsearch.replicas=1 \
-          --set elasticsearch.minimumMasterNodes=1 \
+          --set eckOperator.enabled=false \
           --set oap.replicas=1 \
           --set ui.image.repository=skywalking/ui \
           --set ui.image.tag=latest \
diff --git a/test/e2e-v2/cases/profiling/ebpf/network/es/es-sharding/e2e.yaml 
b/test/e2e-v2/cases/profiling/ebpf/network/es/es-sharding/e2e.yaml
index f3cff40594..bbab45d005 100644
--- a/test/e2e-v2/cases/profiling/ebpf/network/es/es-sharding/e2e.yaml
+++ b/test/e2e-v2/cases/profiling/ebpf/network/es/es-sharding/e2e.yaml
@@ -44,15 +44,21 @@ setup:
       command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh helm
     - name: Install kubectl
       command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh 
kubectl
-    - name: Install SkyWalking
+    - name: Install ECK operator
       command: |
         kubectl create namespace istio-system
+        helm pull oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
+          --version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" --untar
+        helm dep up skywalking-helm
+        helm -n istio-system install eck-operator 
skywalking-helm/charts/eck-operator-*.tgz
+        kubectl -n istio-system rollout status --watch --timeout=120s 
statefulset/elastic-operator
+    - name: Install SkyWalking
+      command: |
         helm -n istio-system install skywalking \
           oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
           --version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" \
           --set fullnameOverride=skywalking \
-          --set elasticsearch.replicas=1 \
-          --set elasticsearch.minimumMasterNodes=1 \
+          --set eckOperator.enabled=false \
           --set oap.replicas=1 \
           --set ui.image.repository=skywalking/ui \
           --set ui.image.tag=latest \
diff --git a/test/e2e-v2/cases/profiling/ebpf/oncpu/es/e2e.yaml 
b/test/e2e-v2/cases/profiling/ebpf/oncpu/es/e2e.yaml
index 9ccf6e8c55..7d165991dd 100644
--- a/test/e2e-v2/cases/profiling/ebpf/oncpu/es/e2e.yaml
+++ b/test/e2e-v2/cases/profiling/ebpf/oncpu/es/e2e.yaml
@@ -41,15 +41,21 @@ setup:
       command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh helm
     - name: Install kubectl
       command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh 
kubectl
-    - name: Install SkyWalking
+    - name: Install ECK operator
       command: |
         kubectl create namespace istio-system
+        helm pull oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
+          --version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" --untar
+        helm dep up skywalking-helm
+        helm -n istio-system install eck-operator 
skywalking-helm/charts/eck-operator-*.tgz
+        kubectl -n istio-system rollout status --watch --timeout=120s 
statefulset/elastic-operator
+    - name: Install SkyWalking
+      command: |
         helm -n istio-system install skywalking \
           oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
           --version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" \
           --set fullnameOverride=skywalking \
-          --set elasticsearch.replicas=1 \
-          --set elasticsearch.minimumMasterNodes=1 \
+          --set eckOperator.enabled=false \
           --set oap.replicas=1 \
           --set ui.image.repository=skywalking/ui \
           --set ui.image.tag=latest \
diff --git a/test/e2e-v2/cases/profiling/ebpf/oncpu/es/es-sharding/e2e.yaml 
b/test/e2e-v2/cases/profiling/ebpf/oncpu/es/es-sharding/e2e.yaml
index 3013c54c43..efad216030 100644
--- a/test/e2e-v2/cases/profiling/ebpf/oncpu/es/es-sharding/e2e.yaml
+++ b/test/e2e-v2/cases/profiling/ebpf/oncpu/es/es-sharding/e2e.yaml
@@ -41,15 +41,21 @@ setup:
       command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh helm
     - name: Install kubectl
       command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh 
kubectl
-    - name: Install SkyWalking
+    - name: Install ECK operator
       command: |
         kubectl create namespace istio-system
+        helm pull oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
+          --version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" --untar
+        helm dep up skywalking-helm
+        helm -n istio-system install eck-operator 
skywalking-helm/charts/eck-operator-*.tgz
+        kubectl -n istio-system rollout status --watch --timeout=120s 
statefulset/elastic-operator
+    - name: Install SkyWalking
+      command: |
         helm -n istio-system install skywalking \
           oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
           --version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" \
           --set fullnameOverride=skywalking \
-          --set elasticsearch.replicas=1 \
-          --set elasticsearch.minimumMasterNodes=1 \
+          --set eckOperator.enabled=false \
           --set oap.replicas=1 \
           --set ui.image.repository=skywalking/ui \
           --set ui.image.tag=latest \
diff --git a/test/e2e-v2/cases/profiling/pprof/es/docker-compose.yml 
b/test/e2e-v2/cases/profiling/pprof/es/docker-compose.yml
index c7d2e9519d..6669917382 100644
--- a/test/e2e-v2/cases/profiling/pprof/es/docker-compose.yml
+++ b/test/e2e-v2/cases/profiling/pprof/es/docker-compose.yml
@@ -17,13 +17,14 @@ version: '3.8'
 
 services:
   es:
-    image: elastic/elasticsearch:7.15.0
+    image: elastic/elasticsearch:8.18.8
     expose:
       - 9200
     networks:
       - e2e
     environment:
       - discovery.type=single-node
+      - xpack.security.enabled=false
       - cluster.routing.allocation.disk.threshold_enabled=false
     healthcheck:
       test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9200"]
diff --git a/test/e2e-v2/cases/profiling/trace/es/docker-compose.yml 
b/test/e2e-v2/cases/profiling/trace/es/docker-compose.yml
index cb777c2f35..b7352440c7 100644
--- a/test/e2e-v2/cases/profiling/trace/es/docker-compose.yml
+++ b/test/e2e-v2/cases/profiling/trace/es/docker-compose.yml
@@ -17,7 +17,7 @@ version: '3.8'
 
 services:
   es:
-    image: elastic/elasticsearch:7.15.0
+    image: elastic/elasticsearch:8.18.8
     expose:
       - 9200
     ports:
@@ -26,6 +26,7 @@ services:
       - e2e
     environment:
       - discovery.type=single-node
+      - xpack.security.enabled=false
       - cluster.routing.allocation.disk.threshold_enabled=false
     healthcheck:
       test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9200"]
diff --git 
a/test/e2e-v2/cases/profiling/trace/es/es-sharding/docker-compose.yml 
b/test/e2e-v2/cases/profiling/trace/es/es-sharding/docker-compose.yml
index af65a69631..c23b2105b6 100644
--- a/test/e2e-v2/cases/profiling/trace/es/es-sharding/docker-compose.yml
+++ b/test/e2e-v2/cases/profiling/trace/es/es-sharding/docker-compose.yml
@@ -17,13 +17,14 @@ version: '3.8'
 
 services:
   es:
-    image: elastic/elasticsearch:7.15.0
+    image: elastic/elasticsearch:8.18.8
     expose:
       - 9200
     networks:
       - e2e
     environment:
       - discovery.type=single-node
+      - xpack.security.enabled=false
       - cluster.routing.allocation.disk.threshold_enabled=false
     healthcheck:
       test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9200"]
diff --git a/test/e2e-v2/cases/rover/process/istio/e2e.yaml 
b/test/e2e-v2/cases/rover/process/istio/e2e.yaml
index 52949e06e8..6932c96483 100644
--- a/test/e2e-v2/cases/rover/process/istio/e2e.yaml
+++ b/test/e2e-v2/cases/rover/process/istio/e2e.yaml
@@ -45,14 +45,21 @@ setup:
       command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh helm
     - name: Install kubectl
       command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh 
kubectl
+    - name: Install ECK operator
+      command: |
+        helm pull oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
+          --version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" --untar
+        helm dep up skywalking-helm
+        helm -n istio-system install eck-operator 
skywalking-helm/charts/eck-operator-*.tgz \
+          --create-namespace
+        kubectl -n istio-system rollout status --watch --timeout=120s 
statefulset/elastic-operator
     - name: Install SkyWalking
       command: |
         helm -n istio-system install skywalking \
           oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
           --version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" \
           --set fullnameOverride=skywalking \
-          --set elasticsearch.replicas=1 \
-          --set elasticsearch.minimumMasterNodes=1 \
+          --set eckOperator.enabled=false \
           --set oap.replicas=1 \
           --set ui.image.repository=skywalking/ui \
           --set ui.image.tag=latest \
diff --git a/test/e2e-v2/cases/storage/es/es-sharding/docker-compose.yml 
b/test/e2e-v2/cases/storage/es/es-sharding/docker-compose.yml
index f96e6ae06b..f4b8141dce 100644
--- a/test/e2e-v2/cases/storage/es/es-sharding/docker-compose.yml
+++ b/test/e2e-v2/cases/storage/es/es-sharding/docker-compose.yml
@@ -17,7 +17,7 @@ version: '2.1'
 
 services:
   es:
-    image: elastic/elasticsearch:7.15.0
+    image: elastic/elasticsearch:8.18.8
     expose:
       - 9200
     networks:
diff --git a/test/e2e-v2/cases/zipkin/es/docker-compose.yml 
b/test/e2e-v2/cases/zipkin/es/docker-compose.yml
index fb11bf4647..07d77506be 100644
--- a/test/e2e-v2/cases/zipkin/es/docker-compose.yml
+++ b/test/e2e-v2/cases/zipkin/es/docker-compose.yml
@@ -17,7 +17,7 @@ version: '2.1'
 
 services:
   es:
-    image: elastic/elasticsearch:7.15.0
+    image: elastic/elasticsearch:8.18.8
     expose:
       - 9200
     networks:
diff --git a/test/e2e-v2/cases/zipkin/es/es-sharding/docker-compose.yml 
b/test/e2e-v2/cases/zipkin/es/es-sharding/docker-compose.yml
index 358dc43abe..85e7217305 100644
--- a/test/e2e-v2/cases/zipkin/es/es-sharding/docker-compose.yml
+++ b/test/e2e-v2/cases/zipkin/es/es-sharding/docker-compose.yml
@@ -17,7 +17,7 @@ version: '2.1'
 
 services:
   es:
-    image: elastic/elasticsearch:7.15.0
+    image: elastic/elasticsearch:8.18.8
     expose:
       - 9200
     networks:
diff --git a/test/e2e-v2/script/env b/test/e2e-v2/script/env
index 0850fba48e..9f5a95fdaf 100644
--- a/test/e2e-v2/script/env
+++ b/test/e2e-v2/script/env
@@ -21,7 +21,7 @@ SW_AGENT_GO_COMMIT=afa75a3cc8c31f142102443af6164b825d63d8fc
 SW_AGENT_PYTHON_COMMIT=b91ebc46010ba6a46b251d4df54190c3b64f2db8
 SW_AGENT_CLIENT_JS_COMMIT=f08776d909eb1d9bc79c600e493030651b97e491
 SW_AGENT_CLIENT_JS_TEST_COMMIT=4f1eb1dcdbde3ec4a38534bf01dded4ab5d2f016
-SW_KUBERNETES_COMMIT_SHA=6fe5e6f0d3b7686c6be0457733e825ee68cb9b35
+SW_KUBERNETES_COMMIT_SHA=2850db1502283a2d8516146c57cc2b49f1da934b
 SW_ROVER_COMMIT=79292fe07f17f98f486e0c4471213e1961fb2d1d
 SW_BANYANDB_COMMIT=208982aaa11092bc38018a9e1b24eda67e829312
 SW_AGENT_PHP_COMMIT=d1114e7be5d89881eec76e5b56e69ff844691e35


Reply via email to