From 11cb08d0a8c156e3d65ff6bd393a683c3be570de Mon Sep 17 00:00:00 2001
From: ylzhangah <1194926515@qq.com>
Date: Thu, 13 Mar 2025 10:54:41 +0800
Subject: [PATCH 1/2] uprate file

---
 deploy/scripts/1-check-env/check_env.sh | 38 ++++++++++++-------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/deploy/scripts/1-check-env/check_env.sh b/deploy/scripts/1-check-env/check_env.sh
index 8d82a9268..62b42b4aa 100755
--- a/deploy/scripts/1-check-env/check_env.sh
+++ b/deploy/scripts/1-check-env/check_env.sh
@@ -143,28 +143,21 @@ function check_ram {
     return 0
 }
 
-function check_disk {
-    local DISK_THRESHOLD=10000  # 修改为10G（单位：MB）
-    local PERCENT_THRESHOLD=70
+check_disk_space() {
+    local DIR="$1"
+    local THRESHOLD="$2"
 
-    read -r available size <<< $(df -m /var/lib | awk 'NR==2{print $4,$2}')
-    echo -e "${COLOR_INFO}[Info] 磁盘可用空间: ${available}MB, 总大小: ${size}MB${COLOR_RESET}"
+    # 获取当前磁盘使用百分比
+    local USAGE=$(df --output=pcent "$DIR" | tail -n 1 | sed 's/%//g' | tr -d ' ')
 
-    if (( available < DISK_THRESHOLD )); then
-        echo -e "${COLOR_ERROR}[Error] 磁盘空间不足 ${DISK_THRESHOLD} MB${COLOR_RESET}"
-        return 1
-    fi
-
-    local used_after=$(( size - (available - DISK_THRESHOLD) ))
-    local usage_percent=$(( used_after * 100 / size ))
-
-    if (( usage_percent > PERCENT_THRESHOLD )); then
-        echo -e "${COLOR_ERROR}[Error] 部署后磁盘使用率将达 ${usage_percent}% (超过 ${PERCENT_THRESHOLD}%)${COLOR_RESET}"
+    # 检查是否超过阈值
+    if [ "$USAGE" -ge "$THRESHOLD" ]; then
+        echo -e "${COLOR_INFO}[Info] 警告: $DIR 的磁盘使用率已达到 ${USAGE}%，超过阈值 ${THRESHOLD}%${COLOR_RESET}。"
         return 1
+    else
+        echo -e "${COLOR_INFO}$DIR 的磁盘使用率为 ${USAGE}%，低于阈值 ${THRESHOLD}%。${COLOR_RESET}"
+        return 0
     fi
-
-    echo -e "${COLOR_SUCCESS}[Success] 磁盘空间满足要求${COLOR_RESET}"
-    return 0
 }
 
 function check_network {
@@ -202,7 +195,14 @@ function main {
     check_hostname || return 1
     check_dns || return 1
     check_ram || return 1
-    check_disk || return 1
+    check_disk_space "/" 70
+
+    # 根据返回值处理逻辑
+    if [ $? -eq 1 ]; then
+        echo -e "${COLOR_INFO}需要清理磁盘空间！${COLOR_RESET}"
+    else
+        echo -e "${COLOR_SUCCESS}磁盘空间正常。${COLOR_RESET}"
+    fi
     check_network || return 1
     check_selinux || return 1
     check_firewall || return 1
-- 
Gitee


From 3449f3a55b0a03601dcfdbec693b2b66cc233b30 Mon Sep 17 00:00:00 2001
From: ylzhangah <1194926515@qq.com>
Date: Thu, 13 Mar 2025 11:03:02 +0800
Subject: [PATCH 2/2] update file

---
 deploy/scripts/2-install-tools/install_tools.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/scripts/2-install-tools/install_tools.sh b/deploy/scripts/2-install-tools/install_tools.sh
index 95ca1b2b7..33cdb8580 100755
--- a/deploy/scripts/2-install-tools/install_tools.sh
+++ b/deploy/scripts/2-install-tools/install_tools.sh
@@ -157,7 +157,7 @@ function check_k3s_status() {
 }
 
 function apply_traefik_config {
-    local config_file="../../chart_ssl/traefik-config.yml"
+    local config_file="../chart_ssl/traefik-config.yml"
 
     # 检查配置文件是否存在
     if [[ ! -f "$config_file" ]]; then
-- 
Gitee