Upgrade Elasticsearch dependency to ECK 8.18.8#176
Merged
Conversation
Replace the archived elasticsearch Helm chart (7.17.1) with ECK-based charts: eck-operator (3.3.1) and eck-elasticsearch (0.18.1) deploying Elasticsearch 8.18.8. Update SWCK e2e test to use ES 8.18.8 (7.x is EOL). Update skywalking-infra-e2e to latest commit.
kezhenxu94
reviewed
Feb 26, 2026
| - name: eck-operator | ||
| version: 3.3.1 | ||
| repository: https://helm.elastic.co/ | ||
| condition: eckOperator.enabled |
Member
There was a problem hiding this comment.
we used elasticsearch.enabled to control whether elasticsearch is deployed in this chart, maybe we can just reuse it to reduce downstream changes, nit
kezhenxu94
reviewed
Feb 26, 2026
Member
kezhenxu94
left a comment
kezhenxu94
left a comment
There was a problem hiding this comment.
this PR only enable eck in the Helm chart, but it doesn’t actually deploy elasticsearch server, so it’s not equivalent to before, and that’s why we need the test/e2e/swck/deploy-elasticsearch.yaml file, we should add a CR ElasticSearch into the chart with condition elasticsearch.enabled to actually deploy the elasticsearch server
ECK CRDs are installed via subchart templates (not Helm native crds/), so they aren't available when Helm tries to create the Elasticsearch CR in the same release. Split into two steps: install ECK operator first, then install SkyWalking with eckOperator.enabled=false.
The infra-e2e tool panics on jsonpath wait conditions. Use kubectl rollout status inline to wait for the ECK operator StatefulSet.
The ECK operator StatefulSet is named 'elastic-operator', not 'eck-operator'.
The updated skywalking-infra-e2e now stops triggers after reaching the configured times count. Set times to 0 (endless) so the trigger keeps running throughout verification, ensuring log_count_info metrics are generated.
Move OAP_TAG, UI_TAG, SATELLITE_TAG, BANYANDB_TAG and their repo vars from the CI workflow into test/e2e/env. Remove duplicate env.swck file and point all SWCK tests to the shared env file. Remove unused agent commit vars that are not referenced by any test.
OAP/UI: a0cec0ca237792497d2da0b65757d11f58c3f342 BanyanDB: 4b9ac7545a7084514bdaea7f0b8b5b7b13b745a5
- Replace all remote SWCK v0.9.0 component manifests (OAP 9.5.0/H2) with local templates using latest OAP/UI images and proper storage config - Deploy BanyanDB via banyandb-helm chart (version from Chart.yaml) instead of SWCK BanyanDB CRD or raw StatefulSets - Use fullnameOverride=banyandb for clean service naming (banyandb-grpc) - Add skywalking-components.yaml (BanyanDB), skywalking-components-satellite.yaml, and skywalking-components-elasticsearch.yaml as local SWCK component templates - Standardize all tests to use skywalking-system namespace for OAP - Set trigger times: 0 for continuous triggering in banyandb/es tests Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This was accidentally dropped during the env consolidation commit. It is required by install-swctl.sh to download and build swctl. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
… steps Each e2e step runs in a separate shell, so $oap_podname set in one step was empty in the next. Merge the two steps so the variable stays in scope.
kezhenxu94
approved these changes
Feb 27, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
elasticsearchHelm chart (7.17.1) with ECK-based charts:eck-operator(3.3.1) andeck-elasticsearch(0.18.1), deploying Elasticsearch 8.18.8eckOperator.enabled), so the chart is self-containedelasticsearch.nodeSets[].podTemplateskywalking-infra-e2eto latest commitCLAUDE.mdfor project conventionsChanged files
chart/skywalking/Chart.yaml— new ECK dependencieschart/skywalking/values.yaml— ECK-compatible config with comprehensive optionschart/skywalking/values-my-es.yaml— external ES examplechart/skywalking/templates/_helpers.tpl— ES fullname helper + ECK service/auth wiringchart/skywalking/templates/NOTES.txt— remove old persistence warningchart/skywalking/README.md— separate ES config tables for nested ECK structureREADME.md— ECK install docs, external ES example, BanyanDB flagstest/e2e/values.yaml— ECK nodeSets configtest/e2e/e2e-elasticsearch.yaml— remove old replicas/minimumMasterNodes flagstest/e2e/swck/oap-ui-agent-elasticsearch.yaml— use local ES 8.18.8 deploytest/e2e/swck/deploy-elasticsearch.yaml— new standalone ES 8.18.8 for SWCK test.github/workflows/e2e.ci.yaml— update infra-e2e commitTest plan
helm dep update chart/skywalkingpulls new ECK dependencieshelm templaterenders correctly with default valueshelm templaterenders correctly withelasticsearch.enabled=falseandeckOperator.enabled=false