Skip to content

Commit 92a8f5d

Browse files
wu-shengwu-sheng
authored
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.
1 parent a0cec0c commit 92a8f5d

File tree

35 files changed

+160
-115
lines changed

35 files changed

+160
-115
lines changed

‎.github/workflows/skywalking.yaml‎

Lines changed: 10 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -376,24 +376,9 @@ jobs:
376376
config: test/e2e-v2/cases/storage/mysql/e2e.yaml
377377
- name: Storage PostgreSQL
378378
config: test/e2e-v2/cases/storage/postgres/e2e.yaml
379-
- name: Storage ES 7.16.3
379+
- name: Storage ES 8.18.8
380380
config: test/e2e-v2/cases/storage/es/e2e.yaml
381-
env: ES_VERSION=7.16.3
382-
- name: Storage ES 7.17.10
383-
config: test/e2e-v2/cases/storage/es/e2e.yaml
384-
env: ES_VERSION=7.17.10
385-
- name: Storage ES 8.1.0
386-
config: test/e2e-v2/cases/storage/es/e2e.yaml
387-
env: ES_VERSION=8.1.0
388-
- name: Storage ES 8.9.0
389-
config: test/e2e-v2/cases/storage/es/e2e.yaml
390-
env: ES_VERSION=8.9.0
391-
- name: Storage ES 8.9.0
392-
config: test/e2e-v2/cases/storage/es/e2e.yaml
393-
env: ES_VERSION=8.18.1
394-
- name: Storage OpenSearch 1.3.10
395-
config: test/e2e-v2/cases/storage/opensearch/e2e.yaml
396-
env: OPENSEARCH_VERSION=1.3.10
381+
env: ES_VERSION=8.18.8
397382
- name: Storage OpenSearch 2.4.0
398383
config: test/e2e-v2/cases/storage/opensearch/e2e.yaml
399384
env: OPENSEARCH_VERSION=2.4.0
@@ -424,15 +409,9 @@ jobs:
424409
- name: Baseline-driven Alarm BanyanDB
425410
config: test/e2e-v2/cases/baseline/banyandb/e2e.yaml
426411

427-
- name: TTL ES 7.16.3
412+
- name: TTL ES 8.18.8
428413
config: test/e2e-v2/cases/ttl/es/e2e.yaml
429-
env: ES_VERSION=7.16.3
430-
- name: TTL ES 8.8.1
431-
config: test/e2e-v2/cases/ttl/es/e2e.yaml
432-
env: ES_VERSION=8.8.1
433-
- name: TTL ES 8.18.1
434-
config: test/e2e-v2/cases/ttl/es/e2e.yaml
435-
env: ES_VERSION=8.18.1
414+
env: ES_VERSION=8.18.8
436415

437416
- name: Event BanyanDB
438417
config: test/e2e-v2/cases/event/banyandb/e2e.yaml
@@ -445,33 +424,18 @@ jobs:
445424
config: test/e2e-v2/cases/log/mysql/e2e.yaml
446425
- name: Log PostgreSQL
447426
config: test/e2e-v2/cases/log/postgres/e2e.yaml
448-
- name: Log ES 7.16.3
427+
- name: Log ES 8.18.8
449428
config: test/e2e-v2/cases/log/es/e2e.yaml
450-
env: ES_VERSION=7.16.3
451-
- name: Log ES 7.17.10
452-
config: test/e2e-v2/cases/log/es/e2e.yaml
453-
env: ES_VERSION=7.17.10
454-
- name: Log ES 8.8.1 Sharding
455-
config: test/e2e-v2/cases/log/es/es-sharding/e2e.yaml
456-
env: ES_VERSION=8.8.1
457-
- name: Log ES 8.18.1 Sharding
429+
env: ES_VERSION=8.18.8
430+
- name: Log ES 8.18.8 Sharding
458431
config: test/e2e-v2/cases/log/es/es-sharding/e2e.yaml
459-
env: ES_VERSION=8.18.1
432+
env: ES_VERSION=8.18.8
460433
- name: Log BanyanDB
461434
config: test/e2e-v2/cases/log/banyandb/e2e.yaml
462435

463-
- name: Log FluentBit ES 7.16.3
436+
- name: Log FluentBit ES 8.18.8
464437
config: test/e2e-v2/cases/log/fluent-bit/e2e.yaml
465-
env: ES_VERSION=7.16.3
466-
- name: Log FluentBit ES 7.17.10
467-
config: test/e2e-v2/cases/log/fluent-bit/e2e.yaml
468-
env: ES_VERSION=7.17.10
469-
- name: Log FluentBit ES 8.8.1
470-
config: test/e2e-v2/cases/log/fluent-bit/e2e.yaml
471-
env: ES_VERSION=8.8.1
472-
- name: Log FluentBit ES 8.18.1
473-
config: test/e2e-v2/cases/log/fluent-bit/e2e.yaml
474-
env: ES_VERSION=8.18.1
438+
env: ES_VERSION=8.18.8
475439

476440
- name: Trace Profiling BanyanDB
477441
config: test/e2e-v2/cases/profiling/trace/banyandb/e2e.yaml
@@ -483,16 +447,9 @@ jobs:
483447
config: test/e2e-v2/cases/profiling/trace/mysql/e2e.yaml
484448
- name: Trace Profiling Postgres
485449
config: test/e2e-v2/cases/profiling/trace/postgres/e2e.yaml
486-
- name: Trace Profiling OpenSearch 1.1.0
487-
config: test/e2e-v2/cases/profiling/trace/opensearch/e2e.yaml
488-
env: OPENSEARCH_VERSION=1.1.0
489-
- name: Trace Profiling OpenSearch 1.3.6
490-
config: test/e2e-v2/cases/profiling/trace/opensearch/e2e.yaml
491-
env: OPENSEARCH_VERSION=1.3.6
492450
- name: Trace Profiling OpenSearch 2.4.0
493451
config: test/e2e-v2/cases/profiling/trace/opensearch/e2e.yaml
494452
env: OPENSEARCH_VERSION=2.4.0
495-
496453
- name: Go Trace Profiling
497454
config: test/e2e-v2/cases/profiling/trace/go/e2e.yaml
498455

@@ -641,8 +598,6 @@ jobs:
641598
config: test/e2e-v2/cases/zipkin/es/es-sharding/e2e.yaml
642599
- name: Zipkin MySQL
643600
config: test/e2e-v2/cases/zipkin/mysql/e2e.yaml
644-
- name: Zipkin Opensearch
645-
config: test/e2e-v2/cases/zipkin/opensearch/e2e.yaml
646601
- name: Zipkin Postgres
647602
config: test/e2e-v2/cases/zipkin/postgres/e2e.yaml
648603
- name: Zipkin Kafka
@@ -707,12 +662,6 @@ jobs:
707662
config: test/e2e-v2/cases/menu/mysql/e2e.yaml
708663
- name: UI Menu Postgres
709664
config: test/e2e-v2/cases/menu/postgres/e2e.yaml
710-
- name: UI Menu OpenSearch 1.1.0
711-
config: test/e2e-v2/cases/menu/opensearch/e2e.yaml
712-
env: OPENSEARCH_VERSION=1.1.0
713-
- name: UI Menu OpenSearch 1.3.6
714-
config: test/e2e-v2/cases/menu/opensearch/e2e.yaml
715-
env: OPENSEARCH_VERSION=1.3.6
716665
- name: UI Menu OpenSearch 2.4.0
717666
config: test/e2e-v2/cases/menu/opensearch/e2e.yaml
718667
env: OPENSEARCH_VERSION=2.4.0

‎docs/en/changes/changes.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* Add `CLAUDE.md` as AI assistant guide for the project.
1313
* Upgrade Groovy to 5.0.3 in OAP backend.
1414
* Bump up nodejs to v24.13.0 for the latest UI(booster-ui) compiling.
15+
* 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.
1516
* Add `library-batch-queue` module — a partitioned, self-draining queue with type-based dispatch,
1617
adaptive partitioning, idle backoff, and throughput-weighted drain rebalancing (`DrainBalancer`).
1718
Designed to replace DataCarrier in high-fan-out scenarios.

‎test/e2e-v2/cases/alarm/es/docker-compose.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@ version: '2.1'
1717

1818
services:
1919
es:
20-
image: elastic/elasticsearch:7.15.0
20+
image: elastic/elasticsearch:8.18.8
2121
expose:
2222
- 9200
2323
networks:
2424
- e2e
2525
environment:
2626
- discovery.type=single-node
27+
- xpack.security.enabled=false
2728
healthcheck:
2829
test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9200"]
2930
interval: 5s

‎test/e2e-v2/cases/alarm/es/es-sharding/docker-compose.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@ version: '2.1'
1717

1818
services:
1919
es:
20-
image: elastic/elasticsearch:7.15.0
20+
image: elastic/elasticsearch:8.18.8
2121
expose:
2222
- 9200
2323
networks:
2424
- e2e
2525
environment:
2626
- discovery.type=single-node
27+
- xpack.security.enabled=false
2728
healthcheck:
2829
test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9200"]
2930
interval: 5s

‎test/e2e-v2/cases/baseline/es/docker-compose.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@ version: '2.1'
1717

1818
services:
1919
es:
20-
image: elastic/elasticsearch:7.15.0
20+
image: elastic/elasticsearch:8.18.8
2121
expose:
2222
- 9200
2323
networks:
2424
- e2e
2525
environment:
2626
- discovery.type=single-node
27+
- xpack.security.enabled=false
2728
healthcheck:
2829
test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9200"]
2930
interval: 5s

‎test/e2e-v2/cases/baseline/es/es-sharding/docker-compose.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@ version: '2.1'
1717

1818
services:
1919
es:
20-
image: elastic/elasticsearch:7.15.0
20+
image: elastic/elasticsearch:8.18.8
2121
expose:
2222
- 9200
2323
networks:
2424
- e2e
2525
environment:
2626
- discovery.type=single-node
27+
- xpack.security.enabled=false
2728
healthcheck:
2829
test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9200"]
2930
interval: 5s

‎test/e2e-v2/cases/browser/es/docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ version: '2.1'
1717

1818
services:
1919
es:
20-
image: elastic/elasticsearch:7.15.0
20+
image: elastic/elasticsearch:8.18.8
2121
expose:
2222
- 9200
2323
networks:

‎test/e2e-v2/cases/browser/es/es-sharding/docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ version: '2.1'
1717

1818
services:
1919
es:
20-
image: elastic/elasticsearch:7.15.0
20+
image: elastic/elasticsearch:8.18.8
2121
expose:
2222
- 9200
2323
networks:

‎test/e2e-v2/cases/cilium/e2e.yaml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,21 @@ setup:
4747
bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh cilium
4848
cilium install --wait
4949
cilium status --wait
50+
- name: Install ECK operator
51+
command: |
52+
helm pull oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
53+
--version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" --untar
54+
helm dep up skywalking-helm
55+
helm -n kube-system install eck-operator skywalking-helm/charts/eck-operator-*.tgz \
56+
--create-namespace
57+
kubectl -n kube-system rollout status --watch --timeout=120s statefulset/elastic-operator
5058
- name: Install SkyWalking
5159
command: |
5260
helm -n kube-system install skywalking \
5361
oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
5462
--version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" \
5563
--set fullnameOverride=skywalking \
56-
--set elasticsearch.replicas=1 \
57-
--set elasticsearch.minimumMasterNodes=1 \
64+
--set eckOperator.enabled=false \
5865
--set oap.replicas=1 \
5966
--set ui.image.repository=skywalking/ui \
6067
--set ui.image.tag=latest \

‎test/e2e-v2/cases/cluster/zk/es/docker-compose.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,14 @@ services:
2929
retries: 120
3030

3131
es:
32-
image: elastic/elasticsearch:7.15.0
32+
image: elastic/elasticsearch:8.18.8
3333
expose:
3434
- 9200
3535
networks:
3636
- e2e
3737
environment:
3838
- discovery.type=single-node
39+
- xpack.security.enabled=false
3940
- cluster.routing.allocation.disk.threshold_enabled=false
4041
healthcheck:
4142
test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9200"]

0 commit comments

Comments
 (0)