From 812dadd8709e45c8f08330234e30b647bfdb3b3d Mon Sep 17 00:00:00 2001
From: kezhenxu94 <kezhenxu94@apache.org>
Date: Fri, 6 Sep 2024 14:26:26 +0800
Subject: [PATCH 1/5] Allow manually rebuild docker images

---
 .github/workflows/publish-docker.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml
index 63fcf746..f32e3310 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -20,6 +20,7 @@ on:
   push:
     branches:
       - main
+  workflow_dispatch:
 
 env:
   HUB: ghcr.io/apache/skywalking-satellite

From 7bf7ea71c0b3a2ca221e965a22ad7c53a9dec8b9 Mon Sep 17 00:00:00 2001
From: kezhenxu94 <kezhenxu94@apache.org>
Date: Fri, 6 Sep 2024 14:31:58 +0800
Subject: [PATCH 2/5] Update e2e-istio.yaml

---
 .github/workflows/e2e-istio.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/e2e-istio.yaml b/.github/workflows/e2e-istio.yaml
index 0d50a7c9..23725d59 100644
--- a/.github/workflows/e2e-istio.yaml
+++ b/.github/workflows/e2e-istio.yaml
@@ -51,7 +51,7 @@ jobs:
       - name: Build Docker Image
         shell: bash
         run: make docker
-      - uses: apache/skywalking-infra-e2e@ebdfc93c9a1def23df14edd408e98654a1fe60cb
+      - uses: apache/skywalking-infra-e2e@cf589b4a0b9f8e6f436f78e9cfd94a1ee5494180
         with:
           e2e-file: test/e2e/case/istio/als/e2e.yaml
 
@@ -77,7 +77,7 @@ jobs:
       - name: Build Docker Image
         shell: bash
         run: make docker
-      - uses: apache/skywalking-infra-e2e@45584853d6f660102c523b1e9cb5815d12ae55d3
+      - uses: apache/skywalking-infra-e2e@cf589b4a0b9f8e6f436f78e9cfd94a1ee5494180
         with:
           e2e-file: test/e2e/case/istio/metrics/e2e.yaml
       - uses: actions/upload-artifact@v2

From 072e3cc966530d9f52a48130561c5f61df0f82dd Mon Sep 17 00:00:00 2001
From: kezhenxu94 <kezhenxu94@apache.org>
Date: Fri, 6 Sep 2024 14:32:10 +0800
Subject: [PATCH 3/5] Update e2e-native.yaml

---
 .github/workflows/e2e-native.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/e2e-native.yaml b/.github/workflows/e2e-native.yaml
index ce471b5e..4bba4f12 100644
--- a/.github/workflows/e2e-native.yaml
+++ b/.github/workflows/e2e-native.yaml
@@ -49,7 +49,7 @@ jobs:
           ./mvnw --batch-mode -f provider/pom.xml clean package -Dsw.version=8.7.0
           ./mvnw --batch-mode -f consumer/pom.xml clean package -Dsw.version=8.7.0
       - name: ${{ matrix.test.name }}
-        uses: apache/skywalking-infra-e2e@45584853d6f660102c523b1e9cb5815d12ae55d3
+        uses: apache/skywalking-infra-e2e@cf589b4a0b9f8e6f436f78e9cfd94a1ee5494180
         with:
           e2e-file: $GITHUB_WORKSPACE/${{ matrix.test.config }}
       - uses: actions/upload-artifact@v2

From f5f98a3c0a50fabb38460bdaaee7ad3f4c248336 Mon Sep 17 00:00:00 2001
From: kezhenxu94 <kezhenxu94@apache.org>
Date: Fri, 6 Sep 2024 14:48:06 +0800
Subject: [PATCH 4/5] Bump up Golang to fix wrong go version

---
 .github/workflows/e2e-istio.yaml  | 5 ++---
 .github/workflows/e2e-native.yaml | 6 ------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/e2e-istio.yaml b/.github/workflows/e2e-istio.yaml
index 23725d59..910069dc 100644
--- a/.github/workflows/e2e-istio.yaml
+++ b/.github/workflows/e2e-istio.yaml
@@ -41,7 +41,7 @@ jobs:
       ALS_ANALYZER: ${{ matrix.analyzer }}
     steps:
       - name: Set up Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v5
         with:
           go-version: 1.21
         id: go
@@ -67,7 +67,7 @@ jobs:
       ISTIO_VERSION: ${{ matrix.istio_version }}
     steps:
       - name: Set up Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v5
         with:
           go-version: 1.21
         id: go
@@ -86,4 +86,3 @@ jobs:
         with:
           name: logs
           path: "${{ env.SW_INFRA_E2E_LOG_DIR }}"
-
diff --git a/.github/workflows/e2e-native.yaml b/.github/workflows/e2e-native.yaml
index 4bba4f12..9367e4d4 100644
--- a/.github/workflows/e2e-native.yaml
+++ b/.github/workflows/e2e-native.yaml
@@ -34,11 +34,6 @@ jobs:
     name: Native E2E test
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go
-        uses: actions/setup-go@v2
-        with:
-          go-version: 1.21
-        id: go
       - uses: actions/checkout@v2
         with:
           submodules: true
@@ -58,4 +53,3 @@ jobs:
         with:
           name: logs
           path: "${{ env.SW_INFRA_E2E_LOG_DIR }}"
-

From 5b9387e62ba62d3fc050de0aa1fb3c2199065eb9 Mon Sep 17 00:00:00 2001
From: kezhenxu94 <kezhenxu94@apache.org>
Date: Fri, 6 Sep 2024 16:09:05 +0800
Subject: [PATCH 5/5] Update kind.yaml

---
 test/e2e/case/istio/kind.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/e2e/case/istio/kind.yaml b/test/e2e/case/istio/kind.yaml
index 2f9384fc..d787998a 100644
--- a/test/e2e/case/istio/kind.yaml
+++ b/test/e2e/case/istio/kind.yaml
@@ -18,9 +18,11 @@
 kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
 nodes:
-  # the control plane node config
   - role: control-plane
-  # the three workers
+    image: kindest/node:v1.21.14
   - role: worker
+    image: kindest/node:v1.21.14
   - role: worker
+    image: kindest/node:v1.21.14
   - role: worker
+    image: kindest/node:v1.21.14