From 1618c6fe6d423ccfba75c0721e1b664851eb0822 Mon Sep 17 00:00:00 2001
From: Lyda <1829913225@qq.com>
Date: Thu, 12 Mar 2026 15:04:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B0=86=E7=8E=AF=E5=A2=83=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E9=BB=98=E8=AE=A4=E5=80=BC=E6=94=B9=E4=B8=BA=20false?=
 =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E4=BC=98=E5=8C=96=20kubectl=20=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=AD=A5=E9=AA=A4=E7=9A=84=E6=9D=A1=E4=BB=B6=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将 enable-validation 默认值从 true 改为 false
- kubectl 配置和验证步骤增加工具可用性检测条件
- 环境配置总结中仅在 kubectl 可用时显示版本信息
- 当 enable-validation 为 true 时，Docker 和 kubectl 都改为必需验证
- 优化输出逻辑：仅在 kubectl 验证成功时显示当前上下文
---
 config-env/action.yml                | 12 +++++++-----
 config-env/scripts/validate-tools.sh |  5 +++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/config-env/action.yml b/config-env/action.yml
index 940db78..e3ad733 100644
--- a/config-env/action.yml
+++ b/config-env/action.yml
@@ -22,7 +22,7 @@ inputs:
   enable-validation:
     description: '是否执行环境校验 (true/false)'
     required: false
-    default: 'true'
+    default: 'false'
   docker-registry:
     description: 'Docker 私有仓库地址'
     required: false
@@ -69,7 +69,7 @@ runs:
         ENABLE_VALIDATION: ${{ inputs.enable-validation }}
 
     - name: 配置 kubectl
-      if: ${{ inputs.kube-config != '' }}
+      if: ${{ inputs.kube-config != '' && steps.validate-tools.outputs.kubectl-version != 'not-found' && steps.validate-tools.outputs.kubectl-version != 'skipped' }}
       shell: bash
       run: bash ${{ github.action_path }}/scripts/configure-kubectl.sh
       env:
@@ -77,7 +77,7 @@ runs:
 
     - name: 验证 kubectl 连通性
       id: verify-kubectl
-      if: ${{ inputs.kube-config != '' && inputs.enable-validation != 'false' }}
+      if: ${{ inputs.kube-config != '' && inputs.enable-validation != 'false' && steps.validate-tools.outputs.kubectl-version != 'not-found' && steps.validate-tools.outputs.kubectl-version != 'skipped' }}
       shell: bash
       run: bash ${{ github.action_path }}/scripts/verify-kubectl.sh
 
@@ -97,8 +97,10 @@ runs:
           if [[ "${{ steps.validate-tools.outputs.docker-version }}" != 'not-found' && "${{ steps.validate-tools.outputs.docker-version }}" != 'skipped' ]]; then
             echo "  - Docker: ${{ steps.validate-tools.outputs.docker-version }}"
           fi
-          echo "  - kubectl: ${{ steps.validate-tools.outputs.kubectl-version }}"
+          if [[ "${{ steps.validate-tools.outputs.kubectl-version }}" != 'not-found' && "${{ steps.validate-tools.outputs.kubectl-version }}" != 'skipped' ]]; then
+            echo "  - kubectl: ${{ steps.validate-tools.outputs.kubectl-version }}"
+          fi
         fi
-        if [[ "${{ inputs.kube-config }}" != '' && "${{ inputs.enable-validation }}" != 'false' ]]; then
+        if [[ "${{ inputs.kube-config }}" != '' && "${{ inputs.enable-validation }}" != 'false' && "${{ steps.verify-kubectl.outputs.current-context }}" != '' ]]; then
           echo "  - 当前上下文: ${{ steps.verify-kubectl.outputs.current-context }}"
         fi
diff --git a/config-env/scripts/validate-tools.sh b/config-env/scripts/validate-tools.sh
index d8d9234..f21f001 100644
--- a/config-env/scripts/validate-tools.sh
+++ b/config-env/scripts/validate-tools.sh
@@ -58,7 +58,7 @@ validate_binary() {
 main() {
     : "${GITHUB_OUTPUT:?GITHUB_OUTPUT 未设置}" >/dev/null
 
-    local enable_validation="${ENABLE_VALIDATION:-true}"
+    local enable_validation="${ENABLE_VALIDATION:-false}"
 
     if [[ "$enable_validation" != "true" ]]; then
         log_info "已通过统一开关禁用环境校验"
@@ -67,7 +67,8 @@ main() {
         return 0
     fi
 
-    validate_binary "docker" "false" "docker --version" "docker-version"
+    # 当 enable-validation 为 true 时，Docker 和 kubectl 都是必需的
+    validate_binary "docker" "true" "docker --version" "docker-version"
     validate_binary "kubectl" "true" "kubectl version --client --short 2>/dev/null || kubectl version --client" "kubectl-version"
 }