mirror of
https://git.bjxgj.com/xgj/xgj-actions.git
synced 2025-10-14 11:23:37 +08:00
refactor: 将多个环境校验开关合并为单一的enable-validation配置项
This commit is contained in:
@@ -19,16 +19,8 @@ inputs:
|
||||
description: 'Base64 编码的 kubectl 配置文件'
|
||||
required: false
|
||||
default: ''
|
||||
require-docker:
|
||||
description: '是否校验 docker 可用性 (true/false)'
|
||||
required: false
|
||||
default: 'true'
|
||||
require-kubectl:
|
||||
description: '是否校验 kubectl 可用性 (true/false)'
|
||||
required: false
|
||||
default: 'true'
|
||||
verify-kubectl-cluster:
|
||||
description: '是否验证 kubectl 集群连通性 (true/false)'
|
||||
enable-validation:
|
||||
description: '是否执行环境校验 (true/false)'
|
||||
required: false
|
||||
default: 'true'
|
||||
docker-registry:
|
||||
@@ -74,11 +66,10 @@ runs:
|
||||
shell: bash
|
||||
run: bash ${{ github.action_path }}/scripts/validate-tools.sh
|
||||
env:
|
||||
CHECK_DOCKER: ${{ inputs.require-docker }}
|
||||
CHECK_KUBECTL: ${{ inputs.require-kubectl }}
|
||||
ENABLE_VALIDATION: ${{ inputs.enable-validation }}
|
||||
|
||||
- name: 配置 kubectl
|
||||
if: ${{ inputs.kube-config != '' && inputs.require-kubectl != 'false' }}
|
||||
if: ${{ inputs.kube-config != '' }}
|
||||
shell: bash
|
||||
run: bash ${{ github.action_path }}/scripts/configure-kubectl.sh
|
||||
env:
|
||||
@@ -86,7 +77,7 @@ runs:
|
||||
|
||||
- name: 验证 kubectl 连通性
|
||||
id: verify-kubectl
|
||||
if: ${{ inputs.kube-config != '' && inputs.verify-kubectl-cluster != 'false' && inputs.require-kubectl != 'false' }}
|
||||
if: ${{ inputs.kube-config != '' && inputs.enable-validation != 'false' }}
|
||||
shell: bash
|
||||
run: bash ${{ github.action_path }}/scripts/verify-kubectl.sh
|
||||
|
||||
@@ -102,12 +93,10 @@ runs:
|
||||
shell: bash
|
||||
run: |
|
||||
echo '🎉 环境校验与配置步骤完成'
|
||||
if [[ "${{ inputs.require-docker }}" != 'false' ]]; then
|
||||
if [[ "${{ inputs.enable-validation }}" != 'false' ]]; then
|
||||
echo " - Docker: ${{ steps.validate-tools.outputs.docker-version }}"
|
||||
fi
|
||||
if [[ "${{ inputs.require-kubectl }}" != 'false' ]]; then
|
||||
echo " - kubectl: ${{ steps.validate-tools.outputs.kubectl-version }}"
|
||||
fi
|
||||
if [[ "${{ inputs.kube-config }}" != '' && "${{ inputs.verify-kubectl-cluster }}" != 'false' && "${{ inputs.require-kubectl }}" != 'false' ]]; then
|
||||
if [[ "${{ inputs.kube-config }}" != '' && "${{ inputs.enable-validation }}" != 'false' ]]; then
|
||||
echo " - 当前上下文: ${{ steps.verify-kubectl.outputs.current-context }}"
|
||||
fi
|
||||
|
@@ -58,22 +58,17 @@ validate_binary() {
|
||||
main() {
|
||||
: "${GITHUB_OUTPUT:?GITHUB_OUTPUT 未设置}" >/dev/null
|
||||
|
||||
local check_docker="${CHECK_DOCKER:-true}"
|
||||
local check_kubectl="${CHECK_KUBECTL:-true}"
|
||||
local enable_validation="${ENABLE_VALIDATION:-true}"
|
||||
|
||||
if [[ "$check_docker" != "true" ]]; then
|
||||
log_info "跳过 Docker 校验"
|
||||
if [[ "$enable_validation" != "true" ]]; then
|
||||
log_info "已通过统一开关禁用环境校验"
|
||||
printf 'docker-version=%s\n' "skipped" >> "$GITHUB_OUTPUT"
|
||||
else
|
||||
validate_binary "docker" "true" "docker --version" "docker-version"
|
||||
printf 'kubectl-version=%s\n' "skipped" >> "$GITHUB_OUTPUT"
|
||||
return 0
|
||||
fi
|
||||
|
||||
if [[ "$check_kubectl" != "true" ]]; then
|
||||
log_info "跳过 kubectl 校验"
|
||||
printf 'kubectl-version=%s\n' "skipped" >> "$GITHUB_OUTPUT"
|
||||
else
|
||||
validate_binary "kubectl" "true" "kubectl version --client --short 2>/dev/null || kubectl version --client" "kubectl-version"
|
||||
fi
|
||||
validate_binary "docker" "true" "docker --version" "docker-version"
|
||||
validate_binary "kubectl" "true" "kubectl version --client --short 2>/dev/null || kubectl version --client" "kubectl-version"
|
||||
}
|
||||
|
||||
trap 'log_error "工具校验失败,退出码: $?"' ERR
|
||||
|
Reference in New Issue
Block a user