Skip to content

Commit 7d49b83

Browse files
wu-shengclaude
wu-sheng
and
claude
committed
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 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent f293924 commit 7d49b83

File tree

13 files changed

+104
-34
lines changed

13 files changed

+104
-34
lines changed

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,20 @@ 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 -n kube-system install eck-operator skywalking-helm/charts/eck-operator-*.tgz \
55+
--create-namespace
56+
kubectl -n kube-system rollout status --watch --timeout=120s statefulset/elastic-operator
5057
- name: Install SkyWalking
5158
command: |
5259
helm -n kube-system install skywalking \
5360
oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
5461
--version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" \
5562
--set fullnameOverride=skywalking \
56-
--set elasticsearch.replicas=1 \
57-
--set elasticsearch.minimumMasterNodes=1 \
63+
--set eckOperator.enabled=false \
5864
--set oap.replicas=1 \
5965
--set ui.image.repository=skywalking/ui \
6066
--set ui.image.tag=latest \

‎test/e2e-v2/cases/istio/als/e2e.yaml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,20 @@ setup:
4545
kubectl label namespace default istio-injection=enabled
4646
- name: Install helm
4747
command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh helm
48+
- name: Install ECK operator
49+
command: |
50+
helm pull oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
51+
--version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" --untar
52+
helm -n istio-system install eck-operator skywalking-helm/charts/eck-operator-*.tgz \
53+
--create-namespace
54+
kubectl -n istio-system rollout status --watch --timeout=120s statefulset/elastic-operator
4855
- name: Install SkyWalking
4956
command: |
5057
helm -n istio-system install skywalking \
5158
oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
5259
--version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" \
5360
--set fullnameOverride=skywalking \
54-
--set elasticsearch.replicas=1 \
55-
--set elasticsearch.minimumMasterNodes=1 \
61+
--set eckOperator.enabled=false \
5662
--set oap.env.SW_ENVOY_METRIC_ALS_HTTP_ANALYSIS=$ALS_ANALYZER \
5763
--set oap.env.SW_ENVOY_METRIC_ALS_TCP_ANALYSIS=$ALS_ANALYZER \
5864
--set oap.env.K8S_SERVICE_NAME_RULE='e2e::${service.metadata.name}' \

‎test/e2e-v2/cases/istio/ambient-als/e2e.yaml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,20 @@ setup:
5353
for: condition=available
5454
- name: Install helm
5555
command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh helm
56+
- name: Install ECK operator
57+
command: |
58+
helm pull oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
59+
--version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" --untar
60+
helm -n istio-system install eck-operator skywalking-helm/charts/eck-operator-*.tgz \
61+
--create-namespace
62+
kubectl -n istio-system rollout status --watch --timeout=120s statefulset/elastic-operator
5663
- name: Install SkyWalking
5764
command: |
5865
helm -n istio-system install skywalking \
5966
oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
6067
--version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" \
6168
--set fullnameOverride=skywalking \
62-
--set elasticsearch.replicas=1 \
63-
--set elasticsearch.minimumMasterNodes=1 \
69+
--set eckOperator.enabled=false \
6470
--set oap.env.SW_ENVOY_METRIC_ALS_HTTP_ANALYSIS=$ALS_ANALYZER \
6571
--set oap.env.SW_ENVOY_METRIC_ALS_TCP_ANALYSIS=$ALS_ANALYZER \
6672
--set oap.env.K8S_SERVICE_NAME_RULE='e2e::${service.metadata.name}' \

‎test/e2e-v2/cases/istio/metrics/e2e.yaml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,20 @@ setup:
5555
command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh helm
5656
- name: Install kubectl
5757
command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh kubectl
58+
- name: Install ECK operator
59+
command: |
60+
helm pull oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
61+
--version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" --untar
62+
helm -n istio-system install eck-operator skywalking-helm/charts/eck-operator-*.tgz \
63+
--create-namespace
64+
kubectl -n istio-system rollout status --watch --timeout=120s statefulset/elastic-operator
5865
- name: Install SkyWalking
5966
command: |
6067
helm -n istio-system install skywalking \
6168
oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
6269
--version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" \
6370
--set fullnameOverride=skywalking \
64-
--set elasticsearch.replicas=1 \
65-
--set elasticsearch.minimumMasterNodes=1 \
71+
--set eckOperator.enabled=false \
6672
--set oap.env.SW_ENVOY_METRIC_ALS_HTTP_ANALYSIS=$ALS_ANALYZER \
6773
--set oap.env.SW_ENVOY_METRIC_ALS_TCP_ANALYSIS=$ALS_ANALYZER \
6874
--set oap.env.K8S_SERVICE_NAME_RULE='e2e::${service.metadata.name}' \

‎test/e2e-v2/cases/profiling/ebpf/access_log/es/e2e.yaml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,20 @@ setup:
4040
command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh helm
4141
- name: Install kubectl
4242
command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh kubectl
43-
- name: Install SkyWalking
43+
- name: Install ECK operator
4444
command: |
4545
kubectl create namespace istio-system
46+
helm pull oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
47+
--version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" --untar
48+
helm -n istio-system install eck-operator skywalking-helm/charts/eck-operator-*.tgz
49+
kubectl -n istio-system rollout status --watch --timeout=120s statefulset/elastic-operator
50+
- name: Install SkyWalking
51+
command: |
4652
helm -n istio-system install skywalking \
4753
oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
4854
--version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" \
4955
--set fullnameOverride=skywalking \
50-
--set elasticsearch.replicas=1 \
51-
--set elasticsearch.minimumMasterNodes=1 \
56+
--set eckOperator.enabled=false \
5257
--set oap.replicas=1 \
5358
--set ui.image.repository=skywalking/ui \
5459
--set ui.image.tag=latest \

‎test/e2e-v2/cases/profiling/ebpf/access_log/es/es-sharding/e2e.yaml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,20 @@ setup:
4040
command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh helm
4141
- name: Install kubectl
4242
command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh kubectl
43-
- name: Install SkyWalking
43+
- name: Install ECK operator
4444
command: |
4545
kubectl create namespace istio-system
46+
helm pull oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
47+
--version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" --untar
48+
helm -n istio-system install eck-operator skywalking-helm/charts/eck-operator-*.tgz
49+
kubectl -n istio-system rollout status --watch --timeout=120s statefulset/elastic-operator
50+
- name: Install SkyWalking
51+
command: |
4652
helm -n istio-system install skywalking \
4753
oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
4854
--version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" \
4955
--set fullnameOverride=skywalking \
50-
--set elasticsearch.replicas=1 \
51-
--set elasticsearch.minimumMasterNodes=1 \
56+
--set eckOperator.enabled=false \
5257
--set oap.replicas=1 \
5358
--set ui.image.repository=skywalking/ui \
5459
--set ui.image.tag=latest \

‎test/e2e-v2/cases/profiling/ebpf/continuous/es/e2e.yaml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,20 @@ setup:
4141
command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh helm
4242
- name: Install kubectl
4343
command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh kubectl
44-
- name: Install SkyWalking
44+
- name: Install ECK operator
4545
command: |
4646
kubectl create namespace istio-system
47+
helm pull oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
48+
--version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" --untar
49+
helm -n istio-system install eck-operator skywalking-helm/charts/eck-operator-*.tgz
50+
kubectl -n istio-system rollout status --watch --timeout=120s statefulset/elastic-operator
51+
- name: Install SkyWalking
52+
command: |
4753
helm -n istio-system install skywalking \
4854
oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
4955
--version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" \
5056
--set fullnameOverride=skywalking \
51-
--set elasticsearch.replicas=1 \
52-
--set elasticsearch.minimumMasterNodes=1 \
57+
--set eckOperator.enabled=false \
5358
--set oap.replicas=1 \
5459
--set ui.image.repository=skywalking/ui \
5560
--set ui.image.tag=latest \

‎test/e2e-v2/cases/profiling/ebpf/continuous/es/es-sharding/e2e.yaml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,20 @@ setup:
4141
command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh helm
4242
- name: Install kubectl
4343
command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh kubectl
44-
- name: Install SkyWalking
44+
- name: Install ECK operator
4545
command: |
4646
kubectl create namespace istio-system
47+
helm pull oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
48+
--version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" --untar
49+
helm -n istio-system install eck-operator skywalking-helm/charts/eck-operator-*.tgz
50+
kubectl -n istio-system rollout status --watch --timeout=120s statefulset/elastic-operator
51+
- name: Install SkyWalking
52+
command: |
4753
helm -n istio-system install skywalking \
4854
oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
4955
--version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" \
5056
--set fullnameOverride=skywalking \
51-
--set elasticsearch.replicas=1 \
52-
--set elasticsearch.minimumMasterNodes=1 \
57+
--set eckOperator.enabled=false \
5358
--set oap.replicas=1 \
5459
--set ui.image.repository=skywalking/ui \
5560
--set ui.image.tag=latest \

‎test/e2e-v2/cases/profiling/ebpf/network/es/e2e.yaml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,20 @@ setup:
4545
command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh helm
4646
- name: Install kubectl
4747
command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh kubectl
48-
- name: Install SkyWalking
48+
- name: Install ECK operator
4949
command: |
5050
kubectl create namespace istio-system
51+
helm pull oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
52+
--version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" --untar
53+
helm -n istio-system install eck-operator skywalking-helm/charts/eck-operator-*.tgz
54+
kubectl -n istio-system rollout status --watch --timeout=120s statefulset/elastic-operator
55+
- name: Install SkyWalking
56+
command: |
5157
helm -n istio-system install skywalking \
5258
oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
5359
--version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" \
5460
--set fullnameOverride=skywalking \
55-
--set elasticsearch.replicas=1 \
56-
--set elasticsearch.minimumMasterNodes=1 \
61+
--set eckOperator.enabled=false \
5762
--set oap.replicas=1 \
5863
--set ui.image.repository=skywalking/ui \
5964
--set ui.image.tag=latest \

‎test/e2e-v2/cases/profiling/ebpf/network/es/es-sharding/e2e.yaml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,20 @@ setup:
4444
command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh helm
4545
- name: Install kubectl
4646
command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh kubectl
47-
- name: Install SkyWalking
47+
- name: Install ECK operator
4848
command: |
4949
kubectl create namespace istio-system
50+
helm pull oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
51+
--version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" --untar
52+
helm -n istio-system install eck-operator skywalking-helm/charts/eck-operator-*.tgz
53+
kubectl -n istio-system rollout status --watch --timeout=120s statefulset/elastic-operator
54+
- name: Install SkyWalking
55+
command: |
5056
helm -n istio-system install skywalking \
5157
oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
5258
--version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" \
5359
--set fullnameOverride=skywalking \
54-
--set elasticsearch.replicas=1 \
55-
--set elasticsearch.minimumMasterNodes=1 \
60+
--set eckOperator.enabled=false \
5661
--set oap.replicas=1 \
5762
--set ui.image.repository=skywalking/ui \
5863
--set ui.image.tag=latest \

0 commit comments

Comments
 (0)