Skip to content

Commit 5622cb9

Browse files
authored
Add Ambient Mesh E2E (#13255)
1 parent 5c1c2eb commit 5622cb9

File tree

24 files changed

+932
-19
lines changed

24 files changed

+932
-19
lines changed

.github/workflows/skywalking.yaml

Lines changed: 65 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -826,7 +826,7 @@ jobs:
826826
KUBERNETES_VERSION: ${{ matrix.versions.kubernetes }}
827827
ALS_ANALYZER: ${{ matrix.analyzer }}
828828
with:
829-
e2e-file: $GITHUB_WORKSPACE/test/e2e-v2/cases/istio/als/e2e.yaml
829+
e2e-file: test/e2e-v2/cases/istio/als/e2e.yaml
830830
- if: ${{ failure() }}
831831
run: |
832832
df -h
@@ -839,6 +839,67 @@ jobs:
839839
name: test-logs-${{ matrix.test.name }}
840840
path: "${{ env.SW_INFRA_E2E_LOG_DIR }}"
841841

842+
e2e-test-istio-ambient:
843+
if: |
844+
( always() && ! cancelled() ) &&
845+
((github.event_name == 'schedule' && github.repository == 'apache/skywalking') || needs.changes.outputs.oap == 'true')
846+
name: E2E test
847+
needs: [docker]
848+
runs-on: ubuntu-24.04
849+
timeout-minutes: 60
850+
strategy:
851+
fail-fast: false
852+
matrix:
853+
analyzer: [k8s-mesh, mx-mesh]
854+
versions:
855+
- istio: 1.23.0
856+
kubernetes: 28
857+
- istio: 1.24.0
858+
kubernetes: 28
859+
steps:
860+
- uses: actions/checkout@v4
861+
with:
862+
submodules: true
863+
persist-credentials: false
864+
- run: grep -v '^#' test/e2e-v2/script/env >> "$GITHUB_ENV"
865+
- uses: apache/skywalking-cli/actions/setup@master
866+
with:
867+
version: ${{ env.SW_CTL_COMMIT }}
868+
- uses: actions/download-artifact@v4
869+
name: Download docker images
870+
with:
871+
name: docker-images-11
872+
path: docker-images
873+
- name: Load docker images
874+
run: |
875+
find docker-images -name "*.tar" -exec docker load -i {} \;
876+
find docker-images -name "*.tar" -exec rm {} \;
877+
- name: Login to ghcr
878+
uses: docker/login-action@v3
879+
with:
880+
registry: ghcr.io
881+
username: ${{ github.repository_owner }}
882+
password: ${{ secrets.GITHUB_TOKEN }}
883+
- name: ${{ matrix.test.name }}
884+
uses: apache/skywalking-infra-e2e@cf589b4a0b9f8e6f436f78e9cfd94a1ee5494180
885+
env:
886+
ISTIO_VERSION: ${{ matrix.versions.istio }}
887+
KUBERNETES_VERSION: ${{ matrix.versions.kubernetes }}
888+
ALS_ANALYZER: ${{ matrix.analyzer }}
889+
with:
890+
e2e-file: test/e2e-v2/cases/istio/ambient-als/e2e.yaml
891+
- if: ${{ failure() }}
892+
run: |
893+
df -h
894+
du -sh .
895+
docker images
896+
- uses: actions/upload-artifact@v4
897+
if: ${{ failure() }}
898+
name: Upload Logs
899+
with:
900+
name: test-istio-ambient-logs-${{ matrix.versions.istio }}-${{ matrix.versions.kubernetes }}-${{ matrix.analyzer }}
901+
path: "${{ env.SW_INFRA_E2E_LOG_DIR }}"
902+
842903
e2e-test-java-versions:
843904
if: |
844905
( always() && ! cancelled() ) &&
@@ -1004,6 +1065,7 @@ jobs:
10041065
- slow-integration-test
10051066
- e2e-test
10061067
- e2e-test-istio
1068+
- e2e-test-istio-ambient
10071069
- e2e-test-java-versions
10081070
runs-on: ubuntu-latest
10091071
timeout-minutes: 10
@@ -1023,13 +1085,15 @@ jobs:
10231085
timeConsumingITResults=${{ needs.slow-integration-test.result }};
10241086
e2eResults=${{ needs.e2e-test.result }};
10251087
e2eIstioResults=${{ needs.e2e-test-istio.result }};
1088+
e2eIstioAmbientResults=${{ needs.e2e-test-istio-ambient.result }};
10261089
e2eJavaVersionResults=${{ needs.e2e-test-java-versions.result }};
10271090
10281091
[[ ${depLicenseResults} == 'success' ]] || [[ ${execute} != 'true' && ${depLicenseResults} == 'skipped' ]] || exit -2;
10291092
[[ ${unitResults} == 'success' ]] || [[ ${execute} != 'true' && ${unitResults} == 'skipped' ]] || exit -3;
10301093
[[ ${integrationResults} == 'success' ]] || [[ ${execute} != 'true' && ${integrationResults} == 'skipped' ]] || exit -4;
10311094
[[ ${e2eResults} == 'success' ]] || [[ ${execute} != 'true' && ${e2eResults} == 'skipped' ]] || exit -5;
10321095
[[ ${e2eIstioResults} == 'success' ]] || [[ ${execute} != 'true' && ${e2eIstioResults} == 'skipped' ]] || exit -6;
1096+
[[ ${e2eIstioAmbientResults} == 'success' ]] || [[ ${execute} != 'true' && ${e2eIstioAmbientResults} == 'skipped' ]] || exit -6;
10331097
[[ ${e2eJavaVersionResults} == 'success' ]] || [[ ${execute} != 'true' && ${e2eJavaVersionResults} == 'skipped' ]] || exit -7;
10341098
[[ ${timeConsumingITResults} == 'success' ]] || [[ ${execute} != 'true' && ${timeConsumingITResults} == 'skipped' ]] || exit -8;
10351099

docs/en/changes/changes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
* Support analysis waypoint metrics in Envoy ALS receiver.
2020
* Add Ztunnel component in the topology.
2121
* [Break Change] Change `compomentId` to `componentIds` in the K8SServiceRelation Scope.
22+
* Adapt the mesh metrics if detect the ambient mesh in the eBPF access log receiver.
2223

2324
#### UI
2425

oap-server/server-receiver-plugin/skywalking-ebpf-receiver-plugin/pom.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,15 @@
3333
<artifactId>skywalking-sharing-server-plugin</artifactId>
3434
<version>${project.version}</version>
3535
</dependency>
36+
<dependency>
37+
<groupId>org.apache.skywalking</groupId>
38+
<artifactId>skywalking-mesh-receiver-plugin</artifactId>
39+
<version>${project.version}</version>
40+
</dependency>
3641
<dependency>
3742
<groupId>org.apache.skywalking</groupId>
3843
<artifactId>agent-analyzer</artifactId>
3944
<version>${project.version}</version>
4045
</dependency>
4146
</dependencies>
42-
</project>
47+
</project>

0 commit comments

Comments
 (0)