From 4473ed9c522691f2d2fa3b722c940517f6ca7717 Mon Sep 17 00:00:00 2001
From: Lyda <1829913225@qq.com>
Date: Sat, 11 Oct 2025 18:38:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=20kubectl=20=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E6=A3=80=E6=B5=8B=E4=BB=A5=E6=94=AF=E6=8C=81=E6=96=B0?=
 =?UTF-8?q?=E6=97=A7=E7=89=88=E6=9C=AC=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config-env/scripts/validate-tools.sh | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/config-env/scripts/validate-tools.sh b/config-env/scripts/validate-tools.sh
index a308b1b..eaa8324 100644
--- a/config-env/scripts/validate-tools.sh
+++ b/config-env/scripts/validate-tools.sh
@@ -28,10 +28,21 @@ validate_binary() {
     local required="$2"
     local version_cmd="$3"
     local output_var="$4"
+    local version_output=""
 
     if command -v "$name" >/dev/null 2>&1; then
-        log_success "检测到 $name: $($version_cmd)"
-        printf '%s=%s\n' "$output_var" "$($version_cmd)" >> "$GITHUB_OUTPUT"
+        if [[ "$name" == "kubectl" ]]; then
+            if version_output=$(kubectl version --client --short 2>/dev/null | head -n 1); then
+                :
+            else
+                version_output=$(kubectl version --client 2>/dev/null | head -n 1)
+            fi
+        else
+            version_output=$(bash -c "$version_cmd")
+        fi
+
+        log_success "检测到 $name: $version_output"
+        printf '%s=%s\n' "$output_var" "$version_output" >> "$GITHUB_OUTPUT"
         return 0
     fi