From 985b58ad5c0b2d3ce22e83c4324756b45c34b7f2 Mon Sep 17 00:00:00 2001
From: EndlessSeeker <153817598+EndlessSeeker@users.noreply.github.com>
Date: Wed, 26 Nov 2025 11:32:15 +0800
Subject: [PATCH] fix: submodule update (#3167)

---
 Makefile.core.mk       | 27 ++-------------------------
 envoy/go-control-plane |  2 +-
 istio/api              |  2 +-
 istio/client-go        |  2 +-
 istio/istio            |  2 +-
 5 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/Makefile.core.mk b/Makefile.core.mk
index f730b82d8..76ddcc411 100644
--- a/Makefile.core.mk
+++ b/Makefile.core.mk
@@ -56,31 +56,8 @@ $(OUT):
 	@mkdir -p $@
 
 submodule:
-	@echo "Initializing submodules..."
-	@git submodule init || true
-	@git submodule update --init --recursive || true
-	@git submodule foreach -q ' \
-		branch="$$(git config -f $${toplevel}/.gitmodules submodule.$${name}.branch)"; \
-		if [ -n "$$branch" ]; then \
-			echo "Updating $$name to branch $$branch"; \
-			if ! git fetch origin "$$branch" 2>/dev/null; then \
-				echo "Error: Branch $$branch not found in remote for $$name. Make sure the branch exists and is accessible."; \
-				exit 1; \
-			fi; \
-			if git show-ref --verify --quiet "refs/remotes/origin/$$branch" 2>/dev/null; then \
-				remote_ref="origin/$$branch"; \
-			else \
-				remote_ref="FETCH_HEAD"; \
-			fi; \
-			if git show-ref --verify --quiet "refs/heads/$$branch" 2>/dev/null; then \
-				git checkout "$$branch" && git reset --hard "$$remote_ref" || { echo "Error: Failed to update $$name to $$branch"; exit 1; }; \
-			else \
-				git checkout -b "$$branch" "$$remote_ref" || { echo "Error: Failed to checkout branch $$branch for $$name"; exit 1; }; \
-			fi; \
-			git branch --set-upstream-to="origin/$$branch" "$$branch" 2>/dev/null || true; \
-			echo "✓ $$name is now on branch $$branch"; \
-		fi \
-	'
+	git submodule update --init
+#	git submodule update --remote
 
 .PHONY: prebuild
 prebuild: submodule
diff --git a/envoy/go-control-plane b/envoy/go-control-plane
index 0ab56e249..90eca0228 160000
--- a/envoy/go-control-plane
+++ b/envoy/go-control-plane
@@ -1 +1 @@
-Subproject commit 0ab56e249a3446c6fbdc39be9d45b9e3fd3a2e3e
+Subproject commit 90eca022817818b6ae3171f64438d748c0ad6d75
diff --git a/istio/api b/istio/api
index d54f2e0f4..5b9a222e7 160000
--- a/istio/api
+++ b/istio/api
@@ -1 +1 @@
-Subproject commit d54f2e0f423d136b51fa4aeddccdb98c09c41ab2
+Subproject commit 5b9a222e72f34fc5f87a3b7344cd4f90c7c6f238
diff --git a/istio/client-go b/istio/client-go
index 9b3841d7d..09ed8dc4e 160000
--- a/istio/client-go
+++ b/istio/client-go
@@ -1 +1 @@
-Subproject commit 9b3841d7dec61c18b474c3d3f2349cf81187e52d
+Subproject commit 09ed8dc4e7484d303c931fa42df7f7c728296923
diff --git a/istio/istio b/istio/istio
index 3a661d92b..3d7792ae2 160000
--- a/istio/istio
+++ b/istio/istio
@@ -1 +1 @@
-Subproject commit 3a661d92b0d541780c961a2984f8a62bb2aa3190
+Subproject commit 3d7792ae287f1600a430c5f11f3de2c168a59a86